linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated README.md

Browse Source 
the procedure may still need to be discussed

Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4
This commit is contained in:
zolliker 2021-04-27 17:00:06 +02:00
parent 1fd16bbc43
commit 539d97a733
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -15,6 +15,7 @@ branches:
- work: current working version, usually in use on /home/l_samenv/frappy (and on neutron instruments) - 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 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 - 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 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. PSI internal files, not mixed. Mark local commits with '[PSI]' in the commit message.
@ -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: changes are done, eventually a sync step should happen:
1) ideally, this is done when work and wip match 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 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) 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 5) create branch new_work from master