From b88750ae2b066cc3324f54e549a0566441b9e3c5 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Wed, 3 Mar 2021 14:47:47 +0100 Subject: [PATCH] update checklist for git branch sync in README.md Change-Id: I788fba8cd748be090f82442ad20c839f206e5e3c --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 19aae1f..a016f8a 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,11 @@ changes are done, eventually a sync step should happen: - core commits already pushed through gerrit are skipped - all other commits are to be cherry-picked 7) when arrived at the point where the new working version should be, - copy new_wip branch to work with 'git checkout -B work'. - Not sure if this works, as work is to be pushed to git.psi.ch. - We might first remove the remote branch with 'git push origin --delete work'. - And then create again (git push origin work)? -8) continue with (6) if wip and work should differ, and do like (7) for wip branch -9) delete new_wip branch, push master, wip and work branches + copy new_wip branch to work with 'git checkout work;git checkout new_wip .' + (note the dot!) and then commit this. +8) continue with (6) if wip and work should differ +9) do like (7), but for wip branch +10) delete new_wip branch, push master, wip and work branches ## Procedure to update PPMS