Sfoglia il codice sorgente

Add info about git merge.

- Add information about git merge command.
testuser1 5 anni fa
parent
commit
ca1637af2b
1 ha cambiato i file con 8 aggiunte e 0 eliminazioni
  1. 8 0
      bob.txt

+ 8 - 0
bob.txt

@@ -0,0 +1,8 @@
+TO - branch (for example master)
+FROM - branch (for example bob)
+
+To do merge just checkout TO:
+$ git checkout TO
+
+Do merge:
+$ git merge FROM