diff --git a/README.md b/README.md index 2cfd3f6..45742f7 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ branches: - work: current working version, usually in use on /home/l_samenv/frappy (and on neutron instruments) this should be a copy of an earlier state of the wip branch - wip: current test version, usually in use on /home/l_samenv/frappy_wip +- archive_*: archived branches - does not contain useful work not already in wip IMPORTANT: make commits containing either only files to be pushed to Gerrit or only PSI internal files, not mixed. Mark local commits with '[PSI]' in the commit message. @@ -35,7 +36,7 @@ where commits may be cherry picked for input to Gerrit. As generally in the revi changes are done, eventually a sync step should happen: 1) ideally, this is done when work and wip match -2) make sure branches mlz, master, wip and work are in synv with remote, push/pull otherwise +2) make sure branches mlz, master, wip and work are in sync with remote, push/pull otherwise 3) cherry-pick commits from mlz to master 4) make sure master and mlz branches match (git diff --name-only master..wip should only return README.md) 5) create branch new_work from master @@ -59,5 +60,5 @@ changes are done, eventually a sync step should happen: cp -r secop_psi /Volumes/PPMSData/zolliker/frappy/secop_psi cp -r secop /Volumes/PPMSData/zolliker/frappy/secop - it may be that additional folder have to copied ... + it may be that we need to copy additional folders ...