What is Nostr?
Will Thompson /
npub1qty…6cjn
2024-05-08 10:22:44

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”?
Author Public Key
npub1qty7zfva8ste9qdh48eaa6pe6njj22sgwx33hnkxjz6nddjfpzjstq6cjn