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.

Comments

Every software engineer should learn how git works. In beginning it could be hard, but it's very useful. GitKraken is great tool to help you manage you project.
Sara Curic - Thu, 12/06/2018 - 11:25 :::
I think its important to know how git works, and not just clicking on an ui. Since at some point a problem is going to spring up and then it's important to know how git is working to solve it. But if you know that, I think tools like GitKraken make your life much easier :)
Andre Bernecker - Thu, 12/06/2018 - 16:15 :::
Previously I hadn't heard of GitKraken but it looks like a very useful tool. Some better IDEs (like IntelliJ) already provide quite capable and nice interfaces for git right out of the box. Using a versatile visual git repository like GitLab can also help in getting to know git, because of the help they give in setting up new git repos via command line interface and providing visual assistance in creating and merging branches. Nevertheless sooner or later no one can ignore the the command line for bigger, professional projects.
Artur Marcin Sz... - Sun, 12/09/2018 - 18:54 :::
Previously I hadn't heard of GitKraken but it looks like a very useful tool. Some better IDEs (like IntelliJ) already provide quite capable and nice interfaces for git right out of the box. Using a versatile visual git repository like GitLab can also help in getting to know git, because of the help they give in setting up new git repos via command line interface and providing visual assistance in creating and merging branches. Nevertheless sooner or later no one can ignore the the command line for bigger, professional projects.
Artur Marcin Sz... - Sun, 12/09/2018 - 18:54 :::
I've already heard of this tool, but never actually used it. You definitely encouraged me to go and try it out next time when I get gitconflict- and we all know this is going to happen because it seems impossible to avoid!
Daria Piacun - Mon, 12/10/2018 - 10:22 :::
No answers yet.