ondrejsika / git-training

Skoleni Gitu
https://skoleni-git.cz
9 stars 6 forks source link

add 'git merge' tutorial #29

Closed svamberg closed 4 years ago

svamberg commented 4 years ago

Add example step-by-step with git merge origin/master and git merge --continue

svamberg commented 4 years ago

sorry, I mean rebase this is same as #4 with a remote repository