Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

What to do if a pull request cannot be automatically merged. #11

Closed
sofer opened this issue Apr 7, 2015 · 2 comments
Closed

What to do if a pull request cannot be automatically merged. #11

sofer opened this issue Apr 7, 2015 · 2 comments

Comments

@sofer
Copy link

sofer commented Apr 7, 2015

"We can’t automatically merge this pull request. Use the command line to resolve conflicts before continuing."

It might be worth briefly covering what to do if a pull request doesn't quite come off and the reasons why it might happen.
@nelsonic
Copy link
Contributor

nelsonic commented Apr 7, 2015

There are quite a few meme images for this section.
got-git-conflict

woody-buzz-git-merge-conflict
( Pictures make it fun... 😜 )

@NataliaLKB
Copy link
Owner

Closing as I dont have time for this now, but feel free to make an addition!

@nelsonic nelsonic mentioned this issue Apr 7, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@sofer @nelsonic @NataliaLKB