Button to pull from master "Get Updates"

unfoldingWord / tc-create-app

translationCore Create

https://create.translationcore.com/

MIT License

0 stars 5 forks source link

Button to pull from master "Get Updates" #1567

Closed birchamp closed 1 year ago

birchamp commented 1 year ago

Details:

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.

Prevent users from editing during update. Using a spinner.

birchamp commented 1 year ago

What other warnings are needed. Check @mandolyte workflow on Discord Collab? channel. https://discord.com/channels/867746700390563850/1087710131271237632/1096086897337581628

elsylambert commented 1 year ago

Looks good in v1.12 build 255-e6e5da8. When there are changes in the master file, the "Get Updates" icon has a red dot 🔴 over it, indicating that user branch is behind. If there is no conflict, users can update their branch with the master, else they would see a pop up stating that they need to contact admin to resolve the conflict.

danielklapp commented 1 year ago

I agree if there’s a change in master file the Update icon has red dot over it, letting user know their branch is behind. User can update their branch with master. Tested with v1.12 build 255-e6e5da8.