search

CSWomenUMass / git

Scenario contribution for GIT Workshop
3 stars 14 forks source link

merge #8

Open Shamya opened 9 years ago

Shamya commented 9 years ago 
git checkout master
git merge <branch>          %conflict reolution
git merge --abort