Julia Evans on Nostr: a bunch of folks have mentioned that they use rerere to avoid solving the same merge ...
a bunch of folks have mentioned that they use rerere to avoid solving the same merge conflict a million times during a rebase. If you use it, do you find it works well? are there any downsides to using it?
Published at
2023-12-07 20:05:07Event JSON
{
"id": "d5977943c8347d38e2e35d09733ce994f94bbff0dccffa84aeb05e8debaf97ec",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1701979507,
"kind": 1,
"tags": [
[
"e",
"a32abac0e51ff9621446de16dd346ebaf0ff02c0b95a59ea811699724914d4a2",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111540928978038673",
"activitypub"
]
],
"content": "a bunch of folks have mentioned that they use rerere to avoid solving the same merge conflict a million times during a rebase. If you use it, do you find it works well? are there any downsides to using it?",
"sig": "386554192de2aa4b425258a4c176b5f6d8511468fe60b0f28067fb0bb95f5797201612e76c85c9f2862b77cbe35a11242ef93fe416351c999d6d0f9701e3c18b"
}
