16 lines
No EOL
720 B
Markdown
16 lines
No EOL
720 B
Markdown
# Git conflict! Help!
|
||
|
||
There’s a million reasons you might have some conflict in git and I won’t cover all of them.
|
||
|
||
Instead, I’ll focus on the reason that causes this 99% of times:
|
||
|
||
- You are working on `your-branch` outside of `master`
|
||
- `master` has advanced and `your-branch` is not up to date with those changes
|
||
- You need to bring those changes into `your-branch` before completing your PR.
|
||
|
||
You can easily do this by using `git rebase` and fixing small conflicts on your branch if they appear.
|
||
|
||
Check this video to understand `git rebase` and how to use it:
|
||
https://www.youtube.com/watch?v=f1wnYdLEpgI
|
||
|
||
If you still don’t understand jackshit and are confused and scared of touching stuff, message Pablo. |