alberanid/git-crash-course
3
2
Fork 0
Code Issues Pull requests Releases Wiki Activity

images for conflicts

Browse source
This commit is contained in:
Davide Alberani 2017-08-13 22:38:13 +02:00
parent 515b9f2699
commit 9602ef69cc
5 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-crash-course.md
View file

@ -389,7 +389,11 @@ Partendo da master:
$ git add file.txt $ git add file.txt
$ git commit $ git commit
TODO: immagine con lo stato corrente <img style="width:300px" src="images/branch-conflict.png" data-action="zoom">
-----
## Risoluzione dei conflitti
Mergiamo: Mergiamo:
@ -398,7 +402,7 @@ Mergiamo:
$ git add file.txt $ git add file.txt
$ git commit $ git commit
TODO: immagine con lo stato corrente <img style="width:300px" src="images/branch-conflict-solved.png" data-action="zoom">
----- -----

BIN
images/branch-conflict-solved.odg Normal file
View file

Binary file not shown.

BIN
images/branch-conflict-solved.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
images/branch-conflict.odg Normal file
View file

Binary file not shown.

BIN
images/branch-conflict.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB