mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Split steps

Tulio Leao
2020-07-06 10:02:20 -03:00
parent 531283f293
commit f48749c09f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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