search

unfoldingWord / tc-create-app

translationCore Create
https://create.translationcore.com/
MIT License
0 stars 5 forks source link

Menu item and dialog for push to master #1569

Closed birchamp closed 1 year ago

birchamp commented 1 year ago

If no conflict:

CleanShot 2023-04-13 at 10.08.58.png

If conflict: Dialog box, "There is a conflict between your branch and . Your work can not be merged without administrative intervention. Please contact your administrator." [OK] button.

elsylambert commented 1 year ago

Looks good in v1.12 build 255-e6e5da8. When there is no conflict users are able to push their changes from user branch to master and then the user branch is deleted automatically. In case of conflict, proper message pops up informing users that they need to contact admin to resolve the conflict manually.

danielklapp commented 1 year ago

Agree that users can push their changes from user branch to master and then the user branch deletes automatically. Also agree if there’s a conflict, that a pop up lets user know to contact admin to resolve the conflict manually. Tested with v1.12 build 255-e6e5da8.