DEV Community

Discussion on: Should you rebase or merge to update feature branches in git?

Collapse
 
timabell profile image
Tim Abell

Thanks, that's really useful info. I knew of rerere but never got round to using it. I think you have to turn it on before you resolve so it can capture the resolution.

Good point about GitHub pull requests too.