Another conflict: resolving conflicts in git that occur when using rebase.
Background   This interactive tutorial about the resolution of conflicts in git is a continu...
Tags: git, newbie, beginners