Changes between Version 7 and Version 8 of GitTips

Timestamp:

03/26/2010 06:19:37 PM (14 years ago)

Author:

andar

Comment:

--

GitTips

@@ -74 +74 @@
 git rm --cached <files>
 }}}
+
+== Merging a remote branch ==
+
+First, add the repo:
+{{{
+#!sh
+git remote add <reponame> <location>
+}}}
+
+Now fetch in the changes:
+{{{
+#!sh
+git fetch <reponame>
+}}}
+
+You'll want to do a diff against your branch to see what will be merged:
+{{{
+#!sh
+git diff master <reponame>/<branch>
+}}}
+
+If you're happy with the changes, go ahead and merge it:
+{{{
+#!sh
+git merge <reponame>/<branch>
+}}}