Recently i switched from using git with gui tools to just console, and love the speed and reliability increase, but guys do you really resolve merge conflicts in console? Is it effective/worth getting used to?

  • 3
    Good luck doing those in console.

    I usually just open the files in vsCode and press accept for the correct block.
    Then head back to the console.
  • 3
    I'd definitely say use what you're comfortable using. Not everyone finds it easy to resolve conflicts manually in an editor, I didn't until recently even though I first started using Git with a CLI
  • 1
    Just use both or git cli and vscode for the conflicts.

    Have workmates who are used to GUI and brags they can do it faster... not sure how to justify cli but there's a lot of things you can do with it and sometimes even faster!

    Reflog, custom git log, everything else I haven't tried yet, etc...

    Or maybe yea, just use both. Cli for complex and stuff it can do faster and GUI for things it can do better.
  • 0
    i use terminal for git but webstorm for resolving conflicts, works like a charm!
Add Comment