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
during rebase or apply changes operation, we have policy to automatically resolve even "unresolvable" conflicts (e.g. 2 different people modify same attribute of base feature). We should create conflict file in such cases so they know what was automatically resolved and for example manually add back some feature or so.
The text was updated successfully, but these errors were encountered:
during rebase or apply changes operation, we have policy to automatically resolve even "unresolvable" conflicts (e.g. 2 different people modify same attribute of base feature). We should create conflict file in such cases so they know what was automatically resolved and for example manually add back some feature or so.
The text was updated successfully, but these errors were encountered: