Methods and systems may provide for tracking, on a position-by-position basis in a diverged code history associated with a diverged source stream, an origin source stream and an original position of code contained within the diverged source stream. Additionally, a modification may be detected with respect to a first portion of the code contained within the diverged source stream at a first position. In such a case, the modification and the first position may be automatically documented in the diverged code history.