Replace with preferred version

Author: c-git

content/git/merge.md

@@ -16,14 +16,21 @@ git merge --abort
 
 # Merge conflicts
 
-Source: <https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull>
-
 ## Taking all of one side
 
 **WARNING: This literally just takes all of one side it's not selective**.
 
+Note: If you are unclear what `theirs` and `ours` refers to it's best to consult [the docs](https://git-scm.com/docs/git-checkout#Documentation/git-checkout.txt---theirs) before issuing any commands.
+
+<details>
+
+<summary>Old approach</summary>
+
+Source: <https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull>
+
+I am keeping this version for reference but I no longer think it's a good approach because it is not exactly what I think of as take theirs.
+It will for example give errors for files that exist in `ours` but not in `theirs`, which kinda isn't what I want.
 If you are already in the merging state and have conflicts and want to take all of ours or theirs you can use one of following.
-If you are unclear what `theirs` and `ours` refers to it's best to consult [the docs](https://git-scm.com/docs/git-checkout#Documentation/git-checkout.txt---theirs) and note it matters if you are rebasing (but this section I'm talking about merging).
 
 ```sh
 git checkout --theirs .
@@ -36,3 +43,11 @@ git checkout --ours .
 ```
 
 You can mark all the conflicts resolved after by using `git add .` or `git add -u` to only stage tracked files.
+
+</details>
+
+When issuing the checkout command specify if you want `ours` or `theirs`.
+
+```sh
+git merge -X theirs <branch-name>
+```