From 539d97a733797f7e7b63a55b9b4ccfaebee07e8d Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 27 Apr 2021 17:00:06 +0200 Subject: [PATCH] updated README.md the procedure may still need to be discussed Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4 --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a016f8a..2cfd3f6 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,9 @@ 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 - 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. + +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. master --> mlz # these branches match after a sync step, but they might have a different history @@ -34,7 +35,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 syns with remote, push/pull otherwise +2) make sure branches mlz, master, wip and work are in synv 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