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

update checklist for git branch sync in README.md

Browse Source 
Change-Id: I788fba8cd748be090f82442ad20c839f206e5e3c
This commit is contained in:
zolliker 2021-03-03 14:47:47 +01:00
parent 9c68f582b7
commit b88750ae2b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -42,12 +42,11 @@ changes are done, eventually a sync step should happen:
- core commits already pushed through gerrit are skipped - core commits already pushed through gerrit are skipped
- all other commits are to be cherry-picked - all other commits are to be cherry-picked
7) when arrived at the point where the new working version should be, 7) when arrived at the point where the new working version should be,
copy new_wip branch to work with 'git checkout -B work'. copy new_wip branch to work with 'git checkout work;git checkout new_wip .'
Not sure if this works, as work is to be pushed to git.psi.ch. (note the dot!) and then commit this.
We might first remove the remote branch with 'git push origin --delete work'. 8) continue with (6) if wip and work should differ
And then create again (git push origin work)? 9) do like (7), but for wip branch
8) continue with (6) if wip and work should differ, and do like (7) for wip branch 10) delete new_wip branch, push master, wip and work branches
9) delete new_wip branch, push master, wip and work branches
## Procedure to update PPMS ## Procedure to update PPMS