Menu
What is exactly is a content level merge?
I've heard this term used a couple times in git discussions.
520
The three main types of merger are horizontal mergers which increase market share, vertical mergers which exploit existing synergies and concentric mergers which expand the product offering.
A horizontal merger is when competing companies merge—companies that sell the same products or services. The T-Mobile and Sprint merger is an example of a horizontal merger. Meanwhile, a vertical merger is a merger of companies with different products, such as the AT&T and Time Warner combination.
There are five commonly-referred to types of business combinations known as mergers: conglomerate merger, horizontal merger, market extension merger, vertical merger and product extension merger.
A merge between two branches where a different set of files has been changed in each branch is a simple (or "trivial") merge. Git doesn't need to look inside the files to see what to do - it just takes the latest of each.
However, if both merge parents change the same file, then Git must look inside the file to see how to apply both changes. This is a "content level merge". The results may be applied automatically if there is no conflict, or may require manual resolution.
199
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
