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.

  • git: why exactly is the claim “git is based on differences between files” wrong?
  • git-clean with GitPython
  • “git log” output differs based on checked-out branch — where do docs explain this?
  • Adding Git notes to a blob
  • Equivalent of “svn checkout” for git?
  • Is it safe to shallow clone with --depth 1, create commits, and pull updates again?
  • Promote Git branch to master
  • Getting error trying to commit using Subversion on Mac OS X
  • Converting Git repository into SVN with SubGit
  • File modified after git clone
  • git: How to fetch from a remote branch and merge into local branch?
  • How to tag an older commit in Git?
  • 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.