An unwanted dependency removal is
A branch in the desired included deps
Which exists in the common ancestor's actual included deps
An unwanted dependency removal is
A branch in the desired included deps
Which exists in the common ancestor's actual included deps
The "best order" for merges is in order of recency of common
ancestor, most recent first, and if that does not distinguish,
merging from local branches first.
The "best order" for merges is in order of recency of common
ancestor, most recent first, and if that does not distinguish,
merging from local branches first.
Check for merge success in the index and compare to exit status
from git-merge (which is 1 if the merge failed).
Adjust the metadata.
Check for merge success in the index and compare to exit status
from git-merge (which is 1 if the merge failed).
Adjust the metadata.
metadata.
Commit, adjusting the parents of the new commit to the original
parents if we made the merge with special massaged parents.
metadata.
Commit, adjusting the parents of the new commit to the original
parents if we made the merge with special massaged parents.