From fad330b71d86fac99fce2f8541478d77c55b0215 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Fri, 26 Feb 2021 17:02:26 +0100 Subject: [PATCH] fixed README added a plan, how to keep mlz and local git in sync --- README.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbdaba9..ab07330 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,37 @@ through the Gerrit workflow at MLZ branches: - mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground -- master: the same as above, but with origin: 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 - wip: current test version, usually in use on /home/l_samenv/frappy_wip +- lastsynced: the last synced state between mlz and wip + + +lastsynced +| | +| | +master work + | + | + wip + + +apply commits from master to work: (rebase ?) or use cherry-pick: + + git cherry-pick .. + +where sha1 is the last commit already in wip, and sha2 ist the last commit to be applied +for a single commit .. may be omitted + +the wip branch is also present in an other directory (currently zolliker/switchdrive/gitmlz/frappy), +where commits may be cherry picked for input to Gerrit. As generally in the review process some additonal +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