2 ms·
If that's the case, I would have the dev go rebase that into a nice single commit. Not the guy doing the integration work. I expect that the dev's last operatio
by dotancohen 4y ago
If that's the case, I would have the dev go rebase that into a nice single commit. Not the guy doing the integration work. I expect that the dev's last operation was to merge from the dev branch, fix conflicts, then push a PR.
At the least, if you're dev refuses to give you a nice commit, you could merge-squash his branch.