att / rcloud

Collaborative data analysis and visualization
http://rcloud.social
MIT License
430 stars 142 forks source link

action icons next to "forked from" to merge to/from #2703

Open s-u opened 4 years ago

s-u commented 4 years ago

It is often useful to merge currently made changed into the notebook that was the base of the fork for the current notebook. For that purpose it may be worthwhile to consider having a button/icon in the top bar next to "forked from ..." that facilitates that operation (i.e., consider the current notebook as a branch that wants to merge changes back to the master).

Note, however, that it could be argued the the inverse (merging changed from that notebook) is also a desirable operation (to catch-up with changes on the master) so it may require some thinking about the symbols/semantics. This action is always doable whereas the former (merge back to parent) is only meaningful if the user is the owner.