3 ms·
I 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 gi
by aidenn0 6y ago
I 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.