How to Manually Resolve Merge Conflicts in Git

Although Git is smart enough to Auto Resolve merge conflicts, There are times when a manual merge must be done by the developer. Lets see how to resolve merge code conflicts manually

  • Intermediate
  • 5 min

The video for this lesson is no longer available.

Course overview

Course content

17 lessons
  1. 1Introducing Git: What is it and Why to Use it3:39
  2. 2Whats the difference between Git & Github?3:38
  3. 3Installing Git and Starting a Git Repo5:04
  4. 4Configuring your Local Git Setup2:38
  5. 5Different File States in Git (Theory)2:58
  6. 6Different File States in Git (Practice)6:38
  7. 7Understanding a Git Commit5:08
  8. 8Git Branch: Organizing Code with Git Branch12:13
  9. 9Git Tag: How and Why to use Git Tags7:14
  10. 10How to Merge Code in Git5:31
  11. 11How to Manually Resolve Merge Conflicts in Git5:10
  12. 12How to use Git Remote to share your project6:29
  13. 13How to add multiple Git Remotes3:53
  14. 14Git Clone in Detail5:09
  15. 15What should be your Workflow in Git7:11
  16. 16Git Rebase: An elegant alternative to merge4:04
  17. 17How to Resolve Merge Conflicts when using Git Rebase6:35