I finally bothered using ediff with my #magit conflicts. It's so good, so much better than #smerge. No idea why it's not the default when hitting enter on a conflict item...
#emacs #diff #git #development
Gene Pasquet /
npub1n6…cqgrs
2024-07-02 09:08:27
Author Public Key
npub1n60cfz2j6ht4wl3x8x66rq03t5sl26p96xjx0a0sndhcw36lm92slcqgrsPublished at
2024-07-02 09:08:27Event JSON
{
"id": "bd3b9831674a6bbd87173f2eb5adb715ffdb457e6d09964212258443446a904d",
"pubkey": "9e9f848952d5d7577e2639b5a181f15d21f56825d1a467f5f09b6f87475fd955",
"created_at": 1719911307,
"kind": 1,
"tags": [
[
"t",
"magit"
],
[
"t",
"smerge"
],
[
"t",
"emacs"
],
[
"t",
"diff"
],
[
"t",
"git"
],
[
"t",
"development"
],
[
"proxy",
"https://emacs.ch/users/etenil/statuses/112716107428842690",
"activitypub"
]
],
"content": "I finally bothered using ediff with my #magit conflicts. It's so good, so much better than #smerge. No idea why it's not the default when hitting enter on a conflict item...\n\n#emacs #diff #git #development",
"sig": "6aebde4b382e43a51fcaced3da47beced2cf3f0ce1296b4ec419ca13a6a3ed1d7c3268769da74e0e96e5b3122f688bcb4ebc1f9592ba6045b45af5d22960e70d"
}