Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ cd ~/workspace/tmp/
- $ git clone git://gist.github.com/1163698.git gist-1163698
- > ...
- $ cd gist-1163698/
- $ git remote add brett git://gist.github.com/1168323.git gist-1168323
- $ git remote add steve git://gist.github.com/1168327.git
- $ git fetch brett
- > ...
- > From git://gist.github.com/1168323
- > * [new branch] master -> brett/master
- $ git fetch steve
- > ...
- > From git://gist.github.com/1168327
- > * [new branch] master -> steve/master
- $ git merge brett/master
- > ...
- $ git merge steve/master
- > ...
- > CONFLICT (content): Merge conflict in hack-requirements.taskpaper
- > Automatic merge failed; fix conflicts and then commit the result.
- > ... resolve conflict ...
- $ git add --all
- $ git commit -m"Merge Brett and Steve schedules."
- $ git push origin master
Add Comment
Please, Sign In to add comment