merge-2

There’s a script called runme.py. Try to run it.

What’s different this time?

Fast forward

๐Ÿงฉ Hints

Click on the hint to see it.

I ran it, now what? Well, it didn’t work, and raised an exception. What does the error say?
OMG I’m in a screen and I don’t know how to get out

How to close the commit message editor.

The default editor on this machine is vim, but you can change that.

I got not something we can merge (โŠ™_โŠ™;) Make sure you’re trying to merge something with the correct name - remember that there are remote branches and local branches, and they are different.
Useful commands for this level git merge (documentation and explanation).