You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Field declarations would only be relevant in case of multiple lines field declarations, otherwise unstructured and semistructured merge report the same conflicts (we have talked about this long time ago). Entire files are handled reporting the same result of unstructured merge, also discussed long time ago. Finally, innerclasses are handled by other handler (DeletionsHandler).
we should empirically confirm that. enums might be a target.
The text was updated successfully, but these errors were encountered:
Let's enumerate the possible cases, and how it works currently:
field declarations: there is no treatment based on the hypothesis that this would only be relevant in case of multiple lines field declarations. Lacks empirical validation.
enums methods and constructors: are handled as classes, i.e, internaly there is no difference between enum methods and class methods
Field declarations would only be relevant in case of multiple lines field declarations, otherwise unstructured and semistructured merge report the same conflicts (we have talked about this long time ago). Entire files are handled reporting the same result of unstructured merge, also discussed long time ago. Finally, innerclasses are handled by other handler (DeletionsHandler).
we should empirically confirm that. enums might be a target.
The text was updated successfully, but these errors were encountered: