Will Thompson on Nostr: Game devs: how do you manage merge conflicts in your projects? A colleague and I were ...
Game devs: how do you manage merge conflicts in your projects? A colleague and I were both independently working on the same Godot project, stored in Git, and so we inevitably had a merge conflict when we each modified the same scene. The scene format is plain text so after a bit of trial & error I resolved the conflict. Are there better tools for this in industry? Or is the tool “don't edit scene X, I'm working on it”?
Published at
2024-05-08 10:22:44Event JSON
{
"id": "27971ce4694ad93c07243437475515fb7748e90a3e69a7faf4698797cb295083",
"pubkey": "02c9e1259d3c179281b7a9f3dee839d4e5252a0871a31bcec690b536b64908a5",
"created_at": 1715163764,
"kind": 1,
"tags": [
[
"proxy",
"https://mastodon.me.uk/users/wjt/statuses/112404972442906936",
"activitypub"
]
],
"content": "Game devs: how do you manage merge conflicts in your projects? A colleague and I were both independently working on the same Godot project, stored in Git, and so we inevitably had a merge conflict when we each modified the same scene. The scene format is plain text so after a bit of trial \u0026 error I resolved the conflict. Are there better tools for this in industry? Or is the tool “don't edit scene X, I'm working on it”?",
"sig": "7ef513ebac400fb91b24c1ec7f7affe8517df58f225ece8bae59dac6ea42f93eb863839bbf46467060ad019f2f81f4ba6ade49c768b4be310f4ffe831bde5a68"
}
