What exactly is a content level merge?

What is exactly is a content level merge?

I’ve heard this term used a couple times in git discussions.

  • GitHub “can't automatically merge”?
  • How to remove “too large” file from git history?
  • How to modify a git repository's history to show contents were imported from another repository?
  • Git fast forward merge: Any chance to find the person to blame?
  • GIT: Reverting last commit?
  • How can I cd outside my git hook directory
  • Moving different projects tracked by git into one repository
  • Ignore specific files when pulling from forked upstream origin
  • How to dynamically pick a git branch to use in Jenkins build
  • How do I undo tracking a remote branch in git?
  • How can I check out a file from another branch into a new file in the current branch with git?
  • git compiling:Documentation/git-add.xml does not validate
  • One Solution collect form web for “What exactly is a content level merge?”

    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.

    Git Baby is a git and github fan, let's start git clone.