izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

lol merge

Browse Source
This commit is contained in:
petrie911
2022-07-28 10:38:18 -05:00
parent f91845a611
commit 0c00544467
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tutorial/intro_to_git.md
+4
View File
@@ -248,7 +248,11 @@ As such, if you only want to learn one of these, learn merging.
If the two branches have both touched the same or nearby lines, git will not know which you want to keep. It will therefore pause the merge/rebase and tell you to decide. You will find a section of the file that looks like this:
```bash
<<<<<<< A
Some code
=======
Some other code
>>>>>>> B
```
from which you should pick one (or combine parts of both as appropriate), then delete the rest. (You definitely do not want the git artefacts left in!)