Remove merge conflicts from additions to same lines
When multiple developers are adding to the same file, additions tend to congregate in certain areas, such as the end of the file. Currently, additions from different branches, when they occur on the same lines of the file, trigger a conflict when merged. Could they simply both be added instead?
Comments: 2
-
26 Jul, '21
Lyndon Gingerich MergedPresently, changes to adjacent lines of code cause conflicts on merge. Could this behavior be removed or made an option? I would prefer to have only changes of the same code count as conflicting, avoiding many unnecessary conflict resolutions.
-
27 Jul, '21
Giacomo Zanotti Admin"Remove merge conflicts from changes to adjacent lines" (suggested by Lyndon on 2021-07-26), including upvotes (1) and comments (0), was merged into this suggestion.