Well, show me tool that handles conflicts, it’s always a developer who has to resolve them.
Yeah without the tool, it is gonna be further tedious.
I just now need to click which change to pick when there is a conflict in gui based tools
This may, or may not, be a surprise to some … but there were source control tools before git. Where there were no such things as merge conflicts.
Merger rejected: Atlas already has his hands full. #GitStruggles😂
Well, show me tool that handles conflicts, it’s always a developer who has to resolve them.
Yeah without the tool, it is gonna be further tedious.
I just now need to click which change to pick when there is a conflict in gui based tools
This may, or may not, be a surprise to some … but there were source control tools before git. Where there were no such things as merge conflicts.