How To Use DiffMerge

mainTo people who don’t know what merge conflicts are, they are these magical things that make our life pleasant when we are coding in a group. Okay that was a joke! Too subtle?¬†Anyway, when you are working in a team on a central code base, multiple people might end up modifying the same thing, which usually results in a conflict. Merge conflicts are bound to happen when you are working in parallel with a team of developers. If it hasn’t happened to you yet, then you haven’t been coding long enough. Most of the version management tools try to manage this automatically. If people are working on different things that are independent of each other, then there will be no problems. But unfortunately, we are not in utopia. Here on earth, conflicts happen all the time. ¬† Continue reading