DEV Community

Discussion on: why branching on git is wrong

Collapse
 
macdoggie78 profile image
Rogier van Doggenaar

I think this approach would change your day job from developer, to merge conflict solver...

I do agree that branches can start growing in separate ways which makes it hard to merge them, but if you keep your stories small, and not let your feature branches exist for weeks, but merge them within a day, or tops three days if there is no one available to check the pull request... Then I think the feature branches are a much better solution then the one suggested.

Collapse
 
nmuta profile image
Nmuta Jones

Well said. Small branches, quickly resolved is the way to go.