From f48749c09fca7175a65a52e9d1de36bada452000 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Mon, 6 Jul 2020 10:02:20 -0300 Subject: [PATCH] Split steps --- Rebase-and-Sync-fork-with-OpenRCT2.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Rebase-and-Sync-fork-with-OpenRCT2.md b/Rebase-and-Sync-fork-with-OpenRCT2.md index e1c558d..9f85147 100644 --- a/Rebase-and-Sync-fork-with-OpenRCT2.md +++ b/Rebase-and-Sync-fork-with-OpenRCT2.md @@ -26,5 +26,7 @@ Eventually, even if you try to keep the fork as synced as possible, you'll have To solve the merge conflicts: 1. Sync your develop branch, as shown above 2. `git checkout your-branch` -3. `git rebase develop`: This will eventually print "merge conflict..." which will require you to open that file, solve the conflict, do `git add that-file` and `git rebase --continue`. There's no big secret here, just follow the instructions on the terminal +3. `git rebase develop`: This will eventually print "merge conflict..." messages which will require you to open each file listed and solve the conflicts +4. `git add -u`: Once you are **sure the conflicts pointed out have been solved**. You can search the repository for `<<<<` to be sure +5. `git rebase --continue`: To continue the rebase. 4. `git push -f origin`: Once the rebase is done and successful, push your rebased branch to GitHub \ No newline at end of file