Intro To Open Source: Managing Merge Conflicts With Ease
Learn how to keep your branch up to date & manage merge conflicts with these simple steps: identify conflicts, update your branch, resolve conflicts & submit a pull request. No more panicking!
I’ve been running an Intro to Open Source workshop for a couple of months now, and one of the biggest challenges for participants often dealing with is keeping their branch up to date and managing merge conflicts. Listen, if you see that “merge conflicts” message and you panic, you’re not alone. I may or may not have used the strategy of deleting my entire local repository, forking, recloning, and redoing my code to avoid navigating merge conflicts more than once. Luckily, there are much better ways of dealing with updating your branch and merge conflicts than that. If you’ve ever felt that pa...