3 ms·
Yeah; I know it sounds evil and this shouldn't be done but why not just make a new branch from the borked master, force push master back to sanity (pre-massive
by cyberpunk 10y ago
Yeah; I know it sounds evil and this shouldn't be done but why not just make a new branch from the borked master, force push master back to sanity (pre-massive merge), have everyone else cherry pick and push their commits and then just rebase new branch and fix the conflicts in there as you should and merge normally?
- btym 10y agoBecause it's selfish. Your time isn't more valuable than that of the developers already working against that branch (and as stated in the article, there were hundreds). It's your job to merge your changes cleanly.
- cyberpunk 10y agoAgree -- I was talking recovery though.. And I missed the hundreds of devs bit apparently. My bad. ....Hundreds of devs though? On the same repo? I started sweating thinking about that one ...
- mjrbrennan 10y agoPretty sure Facebook has one massive repo for all their projects for thousands of devs.