Differences

This shows you the differences between two versions of the page.

--- git [2023/05/08 18:02] – [Resolving a Merge Conflict] dblume
+++ git [2023/06/21 09:22] – [git] dblume
@@ Line 24: / Line 24: @@
   git@fake.github.com:project/project.git
 </code>
+Eventually, if you want to add another branch to a single-branch clone:
+  git remote set-branches --add origin another-branch
+Or to de-single-branch-ize a clone:
+  git remote set-branches origin "*"
 ===== Creating a new remote repository from an existing local one =====
@@ Line 121: / Line 130: @@
 <code>
-git mergetool  # Bring up the vim 3-way diff
+git mergetool (possibly with filename)  # Bring up the vim 3-way diff
-# +----------+-----------+--------------+
+# +----------+-----------+------------------+
-# |          | (common)  |              |
+# | (others) | (common)  | (my most recent) |
-# | LOCAL    | BASE      | REMOTE       |
+# | LOCAL    | BASE      | REMOTE           |
-# +-------------------------------------+
+# +-----------------------------------------+
-# |                                     |
+# |                                         |
-# | temp files with <<< ||| >>> diffs   |
+# | temp file with <<< ||| >>> diffs        |
-# +-------------------------------------+
+# +-----------------------------------------+
-#
+git commit -a -m "Resolved merge conflict"
+</code>
+Possibly keep rebasing.
+<code>
+git rebase --continue
+git pull
 </code>