How to resolve conflicts in git?

Question

linux

When working in a team, there are sometimes file conflicts in git. Phpstorm is good at resolving these conflicts. Everything is clear there. But not long ago I had to work on a low-powered laptop, and phpstorm slows down terribly there. In principle, simple editors such as sublime or atom are becoming obsolete for me. Only here they have poor integration with git. What do you advise ? Maybe there are some plugins? Or third party clients for git. Computers have Lubuntu and Kubuntu.

Answer 1

All such dartanyans as always: no one uses GUI clients, everything is in the console, and who use those suckers. For example, I perfectly combine the tools built into the Idea for working with git and the console. To commit, for example, in Idea, you need to press only three keys: cmd + k > enter a message > enter. It's the same story with conflict resolution.
On the subject: there is a whole mountain of GUI utilities to resolve conflicts: stackoverflow.com/questions/112932/graphical-diff-... and a bunch more are easily googled and are probably on github.
And one more thing: conflicts often arise due to common problems in the development of the project. Those. ideally there should be no conflicts at all, or they should be rare and easy to resolve. For example, if a project consists more than completely of shit code, then different developers, making different features, constantly edit the same pieces of code, and as a result, these features are then difficult to kill because of conflicts, and there is only one solution: get rid of shit code.

Answer 2

understand how git works at the console level and not gui

Answer 3

> On computers is Lubuntu and Kubuntu.
put meld. tolerable visual diff. and set it up in the git
then git mergetool and go ahead
or kdiff3 - all markers have different tastes and colors