Updated Rebase Line Ending Fix (markdown)
parent
d9091fc764
commit
774d49fe1f
|
@ -1,16 +1,14 @@
|
|||
### **NOTE: This page is currently drafted and will not work until [pull request #1946](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/pull/1946) is merge into Cxbx-Reloaded's default branch.**
|
||||
|
||||
Here are the instructions you should follow ensure there are no rebase conflict before rebase on top of Cxbx-Reloaded's default branch.
|
||||
|
||||
## Thoroughly Check Inspection
|
||||
|
||||
1. Pull latest commit from Cxbx-Reloaded's default branch into your default branch.
|
||||
- This is important in order to obtain valid commit hash.
|
||||
2. Perform git rebase at `cdb3b137` commit in front of your branch's commits.
|
||||
- `git rebase cdb3b137 your_branch_name`
|
||||
2. Perform git rebase at `967f53a` commit in front of your branch's commits.
|
||||
- `git rebase 967f53a your_branch_name`
|
||||
3. Fix any rebase conflict you may encounter in order to continue with the next step. Then move on to step 4.
|
||||
4. Same step with #2 except different commit, which is `c181c53`. It is a requirement in order to normalize your commits line up with current default branch.
|
||||
- `git rebase c181c53 your_branch_name -Xrenormalize`
|
||||
4. Same step with #2 except different commit, which is `615b702`. It is a requirement in order to normalize your commits line up with current default branch.
|
||||
- `git rebase 615b702 your_branch_name -Xrenormalize`
|
||||
5. Verify there are no changes staged through `git status` command. If there are, then see step 6 or otherwise go to step 7. Since there is side effect which git didn't perform properly.
|
||||
6. Find the source of the commit then manually renormalize those commit(s) via:
|
||||
- `git add . --renormalize && git commit --amend --no-edit`
|
||||
|
|
Loading…
Reference in New Issue