In my experience, ppl who are using command-line git or magit in Emacs are tying a knot on their genitals with trying to merge branches way more often than ppl using IntelliJ.
I wouldn't know how to explain what does the magic wand do, but it seems a huge waste of time NOT having it in other merge solutions. I can't remember a case where it the magic wand was causing a semantic error and I'm using it for 7-8 years by now. Mostly in Clojure code though.
I wouldn't know how to explain what does the magic wand do, but it seems a huge waste of time NOT having it in other merge solutions. I can't remember a case where it the magic wand was causing a semantic error and I'm using it for 7-8 years by now. Mostly in Clojure code though.