Quantcast
Channel: Version Control Guide (ex-Branching & Merging)
Viewing all articles
Browse latest Browse all 283

New Post: Branch Scheme for Future Releases Using Reparenting

$
0
0

It shouldn't happen, but I'm trying to protect against accidents.  In my environment developers swap teams frequently.  A dev who was working on RELEASE_1 yesterday could easily be working on RELEASE_2 tomorrow.  Given that condition, I can easily foresee a situation where a dev get's confused and (thinking that he is working on the current release) accidentally performs a reverse integration merge from RELEASE_2 into MAIN effectively promoting code ahead of schedule.  My second scheme is focused on trying to prevent this.


Viewing all articles
Browse latest Browse all 283

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>