|↳||java.lang.Enum<E extends java.lang.Enum<E>>|
Conflicts are a natural possibility when PullRequestService#merge(int, long, int)
pull requests. They are not expected to appear in normal
commit diffs, as it is assumed conflicts were resolved before the changes were committed to the repository. The
system will never introduce merge commits which include conflicts into a repository when merging a pull
request; the merge attempt will throw an exception instead. Such conflicts will only be shown when
streamDiff(PullRequestDiffRequest, DiffContentCallback) streaming the diff} for a pull request.
|ConflictMarker||MARKER||Indicates the line is a conflict marker.|
|ConflictMarker||OURS||Indicates the line comes from our version of the file.|
|ConflictMarker||THEIRS||Indicates the line comes from their version of the file.|
Indicates the line is a conflict marker.
Conflict markers come in three types:
ourlines and the beginning of
Indicates the line comes from our version of the file. This is the version that is already on the branch to which the changes are being merged.
Note: Our lines always appear as
context lines, because they are in the file
already. As they are context, how many appear in the diff is dependent on the amount of context being shown.
That means it is possible that some number of our lines will be omitted, if the markers bound a set of lines
greater than the amount of context being shown. If any lines are omitted, it will cause our lines to be split
into two separate
hunks (and, implicitly, into two
segments as well).
Indicates the line comes from their version of the file. This is the version that is being merged into the branch.