Parallel development of diverged source streams

A method of managing parallel development of diverged source streams, comprising:

• 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, wherein the position-by-position basis is an argument/operand order, and wherein the diverged code history is a separate file;
• detecting a modification to a first portion of the code contained within the diverged source stream at a first position;
• presenting, through a user interface device, an option to ignore the detected modification;
• receiving a request to merge shifted code contained within the diverged source stream with the origin source stream;
• searching an origin code history associated with the origin source stream for content corresponding to the shifted code in the diverged code history to resolve the request;
• automatically documenting the modification and the first position in the diverged code history with a textual annotation added to the diverged source stream and another separate file, the textual annotation annotating previous position, source stream and version level;
• receiving a request to merge out-of-order code contained within the diverged source stream with the origin source stream, wherein the out-of-order code was modified prior to other code that has already been merged, wherein at least one other version of the diverged source stream is produced by executing the request to merge;
• detecting a move of a second portion of the code in the diverged source stream from a second position to a third position;
• and
• automatically documenting the move and the second position in the diverged code history,
• wherein the move triggers a move indicator to be prepended to the origin stream indicator and the original position indicator in the diverged code history, and
• wherein the move indicator indicates the diverged source stream and a version level at which the move occurred.