Git merge failed\conflicts

While working on a university course in my bachelor studies I came across the difficulty of using Git for group projects. It seemed that with every push there were conflicts to be resolved and merging was not easy. A great solution for anyone, who does not have a lot of experience with Git is using a Git Client (such as GitKraken). Using a client provides a better overview of what is being merged and resolving conflicts is much easier.
Subscribe to GitKraken