3 ms·
The actual execution time of local git commands is never noticeable in my work. The time spent cleaning up merge conflicts is very noticeable though. I could ve
by tom_mellior 6y ago
The actual execution time of local git commands is never noticeable in my work. The time spent cleaning up merge conflicts is very noticeable though. I could very well imagine being faster overall with a tool that runs half a second longer every time I commit, but that saves me from cleaning up cases where it couldn't figure out a merge.
- aidenn0 6y agoI find that if you spend a lot of time on conflict resolution, it may be an indication your workflow is fighting git. There is a lot of really bad advice on git workflows out there and even worse workflows in the real world. I think gitworkflow(7) should be required reading, as it explains not just how, but why the kernel uses git the way it does
- tom_mellior 6y agoDo you mean https://git-scm.com/docs/gitworkflows https://git-scm.com/docs/gitworkflows ? It doesn't seem to say anything about the kernel. Maybe you mean something else. Our workflow isn't in conflict with any of this, but some parts of our codebase evolve quickly, so topic branches regularly need to merge or rebase conflicting stuff.