Differences

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

--- get:merging_code [2015/11/05 23:21] – leo
+++ get:merging_code [2015/11/06 22:39] (current) – leo
@@ Line 1: / Line 1: @@
+|<- [[get:Configuring the command prompt to show the branch]]|[[get:Using fast-forward merge vs. true merge]] ->|
 Le cas simple :
@@ Line 13: / Line 15: @@
 On peut alors effacer la branche mergée si l'on veut :
-**git branch -d <branche mergée**
+**git branch -d <branche mergée>**
 Mais merger peut, va être compliqué !