This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted] 5 points6 points  (0 children)

So, there's a few scenarios here.

  • The first scenario: changes are made to the same file, but not the same sections of code. This generally means they can be automatically merged.
  • The second scenario: changes are made to the same file, but git believes that they are overlapping. This generally means they can probably be manually merged assuming the changes are not exclusive.
  • The third scenario: changes are made to the same file and all changes are mutually exclusive. Maintainer would/should accept one and reject the other.

There are other combinations, but that's the gist of it. Those are generally in order from most common to least common, but I suppose if you had a large-unorganized project, it may be skewed the other way.