DEV Community

Discussion on: My preferred merge strategy for Pull Requests

Collapse
igorsantos07 profile image
Igor Santos Author

Rob mentioned rerere, but that doesn't help when the conflicting code is a moving target between commits :)