Skip to content

Latest commit

 

History

History
56 lines (44 loc) · 1.25 KB

README-version-numbers.md

File metadata and controls

56 lines (44 loc) · 1.25 KB

Version numbers

This merger resolves conflicts that result from updates to version numbers. If both edits increase the version number from the base, then the merger chooses the greater of the version numbers. A version number is dot-separated numbers, with at least one dot.

We are not aware of any real-world examples where this merger makes a mistake.

Example

Suppose that git merge yields a conflict like the following:

  // Checker Framework pluggable type-checking
<<<<<<< OURS
  id 'org.checkerframework' version '0.6.38'
||||||| BASE
  id 'org.checkerframework' version '0.6.37'
=======
  id 'org.checkerframework' version '0.6.39'
>>>>>>> THEIRS
}

The version-numbers merger would resolve the conflict as:

  // Checker Framework pluggable type-checking
  id 'org.checkerframework' version '0.6.39'
}

Example 2

Given this conflict:

  // Checker Framework pluggable type-checking
<<<<<<< OURS
  id 'org.checkerframework' version '0.5.99'
||||||| BASE
  id 'org.checkerframework' version '0.5.12'
=======
  id 'org.checkerframework' version '0.6.02'
>>>>>>> THEIRS
}

The version-numbers merger would resolve the conflict as:

  // Checker Framework pluggable type-checking
  id 'org.checkerframework' version '0.6.02'
}