3 ms·
If they work on the same branch, what happens if A finishes early and B is late, or abandoned as a bad idea? Instead, A and B should be on separate branches. M
by asolove 13y ago
If they work on the same branch, what happens if A finishes early and B is late, or abandoned as a bad idea?
Instead, A and B should be on separate branches. Maintain integration environments where the feature branches are regularly merged together when each gets to the level of doneness that environment represents. The final step is to get promoted to master-candidate, where you are going to launch tomorrow unless we find a problem. If things break there, blow that away and recreate it from master, and fix your problems one integration environment lower.
- lars 13y ago> what happens if A finishes early and B is late, or abandoned as a bad idea? In those cases, you have to fix the code base, and git wont help you. In my experience, it is much less common to have code that needs to be removed than to have bugs that were introduced because the code bases were synced too late. How much of a problem this is depends on how flexible your release cycle is.