He just jams everything into a single interface.Īll Git knows is that both developers changed some text in the same place. In this scenario, Bob creates an interface for a socket server. They’re all single file, though the concepts work if you work in separate files too. In each of these examples, I try to keep them as simple as possible. Bob only works on master and Alice works in branches. We’ll assume two developers are collaborating on each example, Alice and Bob. If it did understand the structure and semantics of code, it could reduce the number of merge conflicts by a significant amount. It does understand a little bit about the structure of text and code. As far as Git is concerned, you just tappety tap a bunch of random characters into a file. When I run into a merge conflict on GitHub, I flip my desk, set it all on fire, and git reset HEAD -hard and just start over. We ran some surveys and we’d often hear things along the lines of this… It trips up so many developers, whether new or experienced. Every one of them.Īnyways, the most frequent complaint we heard from our users had to do with merge conflicts. The folks that build these things are true heroes in my book.
If you can avoid it, never work on a Git client. When I started at GitHub, I worked on a Git client.
If you do have your hand up - first, you look silly right now. I’ll go out on a limb and guess that nobody has a hand up.
Raise your hand if you enjoy merge conflicts.
0 kommentar(er)
