Chris Krycho on Nostr: If you have ever had to merge two Git repo histories, it is a mildly arcane and ...
If you have ever had to merge two Git repo histories, it is a mildly arcane and annoying process. With #JujutsuVCS, it is… not:
1. Add the second repo as a remote
2. Make a new change (which is how jj does merges) with parents from both repos.
3. There is no step three.
🤯🚀
Published at
2024-04-29 14:48:11Event JSON
{
"id": "7b5d0b29e6ffb391870c739864b681abe8b5427d5cca9865363d3b4025243103",
"pubkey": "991bc7c784f618e159be31da0ff2f015752d8b491b6a40e42eb8608e8aee513f",
"created_at": 1714402091,
"kind": 1,
"tags": [
[
"t",
"jujutsuvcs"
],
[
"proxy",
"https://mastodon.social/users/chriskrycho/statuses/112355055452547173",
"activitypub"
]
],
"content": "If you have ever had to merge two Git repo histories, it is a mildly arcane and annoying process. With #JujutsuVCS, it is… not:\n\n1. Add the second repo as a remote\n2. Make a new change (which is how jj does merges) with parents from both repos.\n3. There is no step three.\n\n🤯🚀",
"sig": "2d648c501f799210108c9fe8e2a71948d810ade049a5a6efecd7c5d94ec4286d186fa78b012fb8a21f1ce93d910ef4b7aabab15a334d2c5507bd5ef21faa9796"
}
