From meetings in Orlando last week we found that there is a need for the various uW apps to have a sync button - meaning to make it easy to merge the main branch into the currently used personal branch.
The sync button can be pressed (show it enabled), when there is no conflict.
If there is a conflict, then maybe this button can show up as red (and disabled).
From @richmahn I have this information:
if a pull request results in a conflict, then a flag, as received from an API call, indicates if the text is mergeable or not.
From meetings in Orlando last week we found that there is a need for the various uW apps to have a sync button - meaning to make it easy to merge the main branch into the currently used personal branch.
The sync button can be pressed (show it enabled), when there is no conflict. If there is a conflict, then maybe this button can show up as red (and disabled).
From @richmahn I have this information: