Conflicts: Practical Part 2

Practice realistic conflict workflows: aborting, taking sides, recreating conflicts, stash and rebase edge cases, mergetool usage, and SmartGit-assisted resolution.