cs-education / sysbuild

A system programming learning environment in the browser
https://cs-education.github.io/sys/
Other
36 stars 35 forks source link

GitHub prompt on push to overwrite or merge with current #153

Closed coltonmercurio closed 8 years ago

coltonmercurio commented 8 years ago

If the user is 'pushing' a directory to a repo that already exists on their account, they will be prompted with the following: screen shot 2016-04-25 at 7 47 24 pm

'Cancel': Closes the prompt and no further action is taken. 'Merge': Merges the directory's contents with the already existing repo. Files with the same path will be overwritten with the new content. 'Overwrite': The user is presented with a confirmation dialog to ensure this is the desired action as it is not reversible. screen shot 2016-04-25 at 7 50 03 pm Confirming the action, the existing repo is deleted and the contents of the selected directory takes its place.