4 ms·
I'm surprised anyone would be willing to consider merging a branch into master that has not itself pulled the latest head from master. It puts the the person ru
by snowwrestler 12y ago
I'm surprised anyone would be willing to consider merging a branch into master that has not itself pulled the latest head from master. It puts the the person running the merge into the position of having to test someone else's code.
It would seem to me that if a branch diffs against an older point in master, then the PR should be rejected as not properly tested. Merging into master should never create a merge conflict; the merge conflict should happen and be resolved on the feature branch first.
Or what am I missing?
- forgottenpass 12y agoOr what am I missing? The linux kernel averages >5 patches per hour. Even with multi-teired maintanership, good luck getting everyone to base their patch sets on the latest upstream head. I know nobody other than the kernel actually uses git as a distributed system, but there are use cases where your ideal workflow can't actually exist.
- kannonboy 12y agoThis is tricky to pull off on busy projects, as master is continually progressing and all open pull request branches would need to be constantly rebased. With the Bitbucket approach, you get to see the conflict in the pull request UI, but you should still resolve it locally on your branch before merging to master.