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

[sofer]

"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]

There are quite a few meme images for this section.

( Pictures make it fun... 😜 )

[NataliaLKB]

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