From: Felipe Contreras <felipe.contreras@gmail.com>
To: Philip Oakley <philipoakley@iee.email>,
Felipe Contreras <felipe.contreras@gmail.com>,
Andre Ulrich <andre.ulrich@smail.fh-koeln.de>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Johannes Sixt <j6t@kdbg.org>, Git Mailing List <git@vger.kernel.org>
Subject: Re: fast forward merge overwriting my code
Date: Wed, 26 May 2021 13:33:27 -0500 [thread overview]
Message-ID: <60ae947797deb_25ba2089c@natae.notmuch> (raw)
In-Reply-To: <da77d0a0-7fdb-e4c8-6510-87ea0294dac4@iee.email>
Philip Oakley wrote:
> 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'.
Andre said they use the diff view, and he wants to be able to edit it.
Not sure how else would you interpret "But in this diff view you can't
edit the files".
--
Felipe Contreras
next prev parent reply other threads:[~2021-05-26 18:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-22 15:48 fast forward merge overwriting my code Andre Ulrich
2021-05-22 17:12 ` Philip Oakley
2021-05-23 15:01 ` Junio C Hamano
2021-05-24 9:50 ` Philip Oakley
2021-05-23 9:48 ` Johannes Sixt
2021-05-23 23:58 ` brian m. carlson
2021-05-24 6:13 ` Andre Ulrich
2021-05-24 11:13 ` Bagas Sanjaya
2021-05-24 13:16 ` Philip Oakley
2021-05-24 15:06 ` Andre Ulrich
2021-05-24 18:48 ` Philip Oakley
2021-05-25 15:14 ` Philip Oakley
2021-05-30 5:31 ` David Aguilar
2021-05-30 11:00 ` Philip Oakley
2021-05-24 17:47 ` Igor Djordjevic
2021-05-26 2:53 ` Felipe Contreras
2021-05-26 11:06 ` Philip Oakley
2021-05-26 18:33 ` Felipe Contreras [this message]
2021-05-26 20:35 ` Philip Oakley
2021-05-26 23:34 ` Felipe Contreras
2021-05-27 12:05 ` Philip Oakley
2021-05-27 14:00 ` Felipe Contreras
2021-05-27 15:12 ` Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60ae947797deb_25ba2089c@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=andre.ulrich@smail.fh-koeln.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=philipoakley@iee.email \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).