We have a team often working in the same notebooks. These notebooks regularly become "un-sync'd", so that we have to choose whose changes to keep. That in and of itself would be nice to avoid; however, given this case, consider that some notebooks have dozens and dozens of cells of code and markdown, and some cells have hundreds of lines of code. Now, we have to scroll through ALL of these cells individually (since each one gets its own scrollbar) to determine whose changes to keep; moreover, we often want to keep both sets of changes, so we'll have to copy out the to-be-discarded changes to pasted back in after accepting the other ones. It's very time-consuming and happens regularly. My second idea is to have the option to choose which cells from each version to keep. More often than not, we are working in different cells in the notebook and want to keep changes from each team members work. So we should be able to choose "Saved Version" for Cell 5 and "Your Version" for Cell 8, etc. Of course, when there is no change it doesn't matter (this ties in with my other suggestion to see "Diff Only" cells, which would provide a view of only cells that are different). Example (as it is today): "Where are the changes? Scroll down to find them. Pick only one set of changes to keep."
... View more