loading...

re: 42 Git Questions Answered VIEW POST

FULL DISCUSSION
 

Great post!

I envy people who can resolve merge conflict in the commandline.
But I like to use professional tools for that task. I really like the integrated git in the JetBrains products. And what I can't do with that, there is command line.

 

Absolutely. Some things are definitely easier with the GUI. Especially when visual. It's good to understand though how Git marks these conflicts though so you could do it manually.

code of conduct - report abuse