diff --git a/README.md b/README.md index 0779a25..f523fc7 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ through the Gerrit workflow at MLZ branches: - mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground + this is not present at git.psi.ch:sinqdev/frappy.git! - master: keep in sync with above before pushing to psi repo (git.psi.ch:sinqdev/frappy.git) - 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 @@ -28,9 +29,13 @@ 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) make copies of branches work and wip -2) pull changes to master from mlz -3) cherry-pick commits (from master) to lastsynced -4) copy lastsynced branch to wip with 'git checkout -B wip' -5) in wip cherry-pick commits not yet feeded into Gerrit from above wip copy -6) decide from where to take new work branch (probably from wip) -7) delete branch copies not needed any more +2) pull changes from mlz repo to mlz branch +3) merge to master: git checkout master / git merge mlz / git push +4) cherry-pick commits (from master) to lastsynced +5) copy lastsynced branch to wip with 'git checkout -B wip'. + Not sure if this works, as wip is to be pushed to git.psi.ch. + We might first remove the remote branch with 'git push origin --delte wip'. + And then create again (check how to do that)? +6) in wip: cherry-pick commits not yet feeded into Gerrit from copy in step (1) +7) decide from where to take new work branch (probably from wip) +8) delete branch copies not needed any more