handling merge conflicts #11

Open
zdennis opened this Issue Mar 30, 2012 · 0 comments

1 participant

@zdennis
Owner

Figure out what to do when a merge conflict happens. Possibly introduce the command:

git <previous-command> --continue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment