Fork me on GitHub
#emacs
<
2022-11-07
>
Drew Verlee21:11:58

What command would i run post git merge to walk through all the git 3 way merge conflicts and resolve them with that 3 way split window?

Drew Verlee21:11:46

i'm so confused, i just did a three way merge, hit save session, and when i get back to the git status window it's still there like i did nothing. Oh i need to refresh

Drew Verlee21:11:53

its 2022 why do i need to refresh

Drew Verlee21:11:34

i'm shocked spacemacs didn't have these auto save variables set to true. https://magit.vc/manual/magit/Automatic-Refreshing-of-Magit-Buffers.html

Drew Verlee22:11:04

i have that set already, im worried its actually messing with my other settings. I mean look at this nonsense:

Drew Verlee22:11:44

thats the result of "magit-ediff" > staging

Drew Verlee22:11:45

yeah lol, i think that setting is whats messing with my head so much. It's like putting the 3 way merge in such a way that i can't use built in emacs ediffing.

Drew Verlee22:11:31

@U45T93RA6 yes, that's what i wanted. What i wanted to uninstall :lol. I had no idea it had that effect. This has been driving me nuts for a couple months now!

😆 1
Drew Verlee21:11:15

I feel like i have to hunt down the files with conflicts and call magit-ediff on all of them.