Sync button - Githubissues

unfoldingWord / gateway-translate

A tool for editing and translating text in USFM markup

MIT License

2 stars 3 forks source link

Sync button #136

Closed larsgson closed 10 months ago

larsgson commented 1 year ago

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.
Here is an example : https://git.door43.org/api/v1/repos/unfoldingWord/en_tn/pulls/3114
indicating "mergeable" as false

birchamp commented 10 months ago

This is a dupe of the merge epic #183