@b0rk@social.jvns.ca voted other -> I'd never heard of a merge conflict tool until your first poll. I haven't looked it up, but I'm not really sure what problem it would solve - I'd still have fix the conflict, right?
Conversation
Notices
-
Embed this notice
jackie@kitty.social's status on Saturday, 24-Feb-2024 05:27:20 JST jackie
-
Embed this notice
Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Saturday, 24-Feb-2024 05:27:12 JST Ryan Castellucci :nonbinary_flag:
@b0rk @jackie I usually just use vim, but for messy cases I will cherry pick commits and use meld.
-
Embed this notice
Julia Evans (b0rk@social.jvns.ca)'s status on Saturday, 24-Feb-2024 05:27:13 JST Julia Evans
@jackie thanks that reminds me i want to ask people what their favourite merge conflict tools are!
-
Embed this notice
Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Saturday, 24-Feb-2024 05:41:13 JST Ryan Castellucci :nonbinary_flag:
@c0dec0dec0de @b0rk @jackie I actually do use vimdiff, but haven't ever tried it for three way merge.
-
Embed this notice
0xC0DEC0DE07E8 (c0dec0dec0de@hachyderm.io)'s status on Saturday, 24-Feb-2024 05:41:14 JST 0xC0DEC0DE07E8
@ryanc @b0rk @jackie the only reason I’ve had to get a graphical session on my remote development machine in recent memory. I really should learn how to use vimdiff.
-
Embed this notice
Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Saturday, 24-Feb-2024 05:42:25 JST Ryan Castellucci :nonbinary_flag:
@c0dec0dec0de @b0rk @jackie Exactly my problem, lol.
-
Embed this notice
0xC0DEC0DE07E8 (c0dec0dec0de@hachyderm.io)'s status on Saturday, 24-Feb-2024 05:42:26 JST 0xC0DEC0DE07E8
@ryanc @b0rk @jackie but those are the ones I need meld for.
-
Embed this notice