Add feature to allow users to update a resource' user branch with content from master branch

unfoldingWord / gateway-edit

Book Package harmonized view.

https://gatewayedit.com

MIT License

1 stars 4 forks source link

Add feature to allow users to update a resource' user branch with content from master branch #232

Open mannycolon opened 3 years ago

BincyJ commented 3 years ago

@birchamp - how would user's want to handle merge conflicts? - Informing the users about the conflicts, what actions do users take? Accept/Reject changes??

Possible RCL needed for merge conflict resolution.

birchamp commented 3 years ago

@mannycolon I'm going to take this out of the edit epic and make it into an epic by itself