Git: Resolving conflicts

• Conflicts are changes made on the same part of the same file in two branches
• Must be resolved manually:
  • edit files with a resolver tool (or text editor)
  • commit the files
  • push to the remote branch