Need help cloning? Visit
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add jonathanclarkroberts/git-workshop https://bitbucket.org/jonathanclarkroberts/git-workshop.git
git fetch jonathanclarkroberts/git-workshop
git merge --no-ff -m 'Merged in jonathanclarkroberts/git-workshop (pull request #2)' remotes/jonathanclarkroberts/git-workshop/master