From a07e53d33862141a647be1e07ffc79159c189763 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Tue, 4 Aug 2020 23:21:17 +0200 Subject: [PATCH] Update branching model example Signed-off-by: Geert Eltink --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index db5908ef..3974e864 100644 --- a/README.md +++ b/README.md @@ -99,11 +99,11 @@ The fix for that bug should be done based on the branch `1.0.x` and, once merged 1. Create a branch from the fixed `1.1.x` (`git checkout 1.1.x && git checkout -b merge-up/1.1.x-into-1.2.x`) 1. Create a PR using `1.2.x` as destination -:warning: when the merge-up can't be merged due to conflicts, we'd need to sync it with the destination branch. +:warning: when the merge-up can't be merged due to conflicts, it needs to be synced with the destination branch. That's done by merging the destination into the merge-up branch and resolving the conflicts locally: -1. Checkout to merge-up branch (`git checkout -b merge-up/1.1.x-into-master`) -1. Sync merge-up branch (`git merge --no-ff origin/master`) +1. Checkout to merge-up branch (`git checkout -b merge-up/1.1.x-into-1.2.x`) +1. Sync merge-up branch (`git merge --no-ff origin/1.2.x`) 1. Solve conflicts (using `git mergetool` or through an IDE) 1. Resume merge (`git merge --continue`) 1. Push (`git push`)