- merging: `git merge --abort`, `git diff ...other`, `git merge --continue` instead of git commit? - `git merge --abort` - last task should be in parallel for mirko and slavko - `git checkout <commit>` and branching from there - `git branch -a` - pull before you start working!
git merge --abort,git diff ...other,git merge --continueinstead of git commit?git merge --abortgit checkout <commit>and branching from theregit branch -a