Re: fast forward merge overwriting my code

> On 26/05/2021 03:53, Felipe Contreras wrote:
> > Andre Ulrich wrote:
> >> So the last point is where we still want to do some fine tuning. Right  
> >> now this looks about: my prof fetches my edits and locally checks out  
> >> a branch to compare the changes with git diff.
> >> But in this diff view you can't edit the files. So you have to  
> >> separately open up another window to edit the changes (lets say my  
> >> prof only wants to keep some of my changes, but not all).
> > So for example after fetching your changes your professor sees this:
> 
> Part of Andre's problem was that this diff wasn't stable because the
> underlying file format is said to be json so items can move around
> without issue (e.g. key value pairs swapping position) and that they
> aren't really working on the json file (it may as well be binary..) but
> on the jupytper notebook display view, so one step removed from the 'diff'.