(This is not a real puzzle yet.)

Try merging the two branches together!

    git merge <otherbranch>