This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2022-11-07
Channels
- # announcements (11)
- # babashka (29)
- # beginners (70)
- # biff (13)
- # calva (1)
- # clojure (24)
- # clojure-europe (125)
- # clojure-nl (1)
- # clojure-norway (7)
- # clojure-portugal (2)
- # clojure-uk (3)
- # clojurescript (9)
- # core-async (29)
- # cursive (4)
- # emacs (10)
- # etaoin (14)
- # events (3)
- # fulcro (10)
- # funcool (4)
- # helix (1)
- # honeysql (12)
- # introduce-yourself (1)
- # jobs (2)
- # juxt (2)
- # lsp (1)
- # off-topic (17)
- # polylith (58)
- # portal (20)
- # remote-jobs (2)
- # shadow-cljs (2)
- # squint (4)
- # tools-deps (9)
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?
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
its 2022 why do i need to refresh
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
is this what you're looking for? https://clojurians.slack.com/archives/C099W16KZ/p1652185550397489
i have that set already, im worried its actually messing with my other settings. I mean look at this nonsense:
thats the result of "magit-ediff" > staging
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.
@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!
I feel like i have to hunt down the files with conflicts and call magit-ediff on all of them.