Merge (push pull functionality)

[birchamp]

Give users a way to pull from Master to update their branch and a way to push their work up to Master.

1) Pull from Master:

• Use icon https://react-icons.github.io/react-icons/search?q=update MdUpdate
• Tool tip should say: "Get Updates"
• If there are conflicts a prompt should come up. "tC Create was unable to update your work because someone else has made changes to the same text you have worked on. Please contact your administrator. 2) Push to Master:
• Add "Merge my work" to the hamburger menu. Do not put a button on the tool bar.
• Merging should give users a dialog prompt with a text box: "You are about to merge your work with the work of the rest of the team. Please comment on the work you have completed." The dialog should have Cancel and 'Merge my work' buttons.

DoD:

Users can use a button to pull from master to their branch, and can use a menu item to commit their work to master.

[abelpz]

@birchamp should the message say someone else made changes to the same file, instead of the same text? With the notes there are conflicts even if two users make changes to different notes in the same file.

[birchamp]

@abelpz the only thing I don't want to communicate is the idea that two users can't work on the same book. They should be able to in most cases. Right @richmahn

[richmahn]

@birchamp Correct. It's just a matter if they change the same place in the file.