At one point or the other, we have all found ourselves guilty of trying to merge our changes before everyone else’ to avoid bearing the pain of resolving the infamous merge conflict hell.
Often resolving merge conflicts takes up a huge chunk of the development time and is sometimes even accepted as a norm.
