Pull Request Conflict Tutorial

Currently, our `git-commands` tutorial has no solution on how to deal with conflicts.

Some features/commands that should be added to `git-commands`
- git rebase --continue
- git rebase -i { COMMIT }
- basic `vi` usage for editing git commits