DEV Community

Discussion on: My preferred merge strategy for Pull Requests

Collapse
 
hoelzro profile image
Rob Hoelz

Thanks for the input Andrew - I definitely had the feeling that PR was getting too big! The way I went about it was very TDD - authoring a test for the bug I was fixing, then getting it to pass, and then repeating that test + pass cycle until I had covered all of the corner cases. How would you recommend splitting that up? I wouldn't really feel comfortable merging a fix into master that I didn't feel was complete, so I'm curious what strategies you would have in mind!

Thread Thread
 
okolbay profile image
andrew • Edited

I’m not sure if you will like this answer =) IMO if tests came out so big, component was also quite big, so maybe its possible to extact/isolate it and cover a small coherent part. Tests would likely to become smaller, and integration tests could be added in a separate branch.

PS yes it means refactoring before fixing a bug, and actually this is what I do too )