On Sat, Nov 20, 2021 at 10:58:54PM +0000, Thomas Adam wrote:
> On Sat, Nov 20, 2021 at 03:16:02PM +0100, Dominik Vogt wrote:
> > Look at commit ba9f161998f7da942996bcf0d3f96baa8b249070.  You
> > added new-parser.md, but also committed a complete reindentation
> > of functions.c.
> Oh heavens.  That's not good at all.  Clearly something has run in the
> background and I had not even noticed at the point I commited that change as I
> was in no way expecting anything other than that markdown file to have
> changed.  That's why I didn't even check.
> Sorry about that.

No problem at all.  This has possibly happened in earlier patches
as well.  There was some one-line minor whitespace change (a line
containing a trailing space).  I removed the trailing space, but
you committed that with the whole, now empty line removed.  That
caused a conflict when rebasing.

>  I'll have to check to see how that happened.

"git add -i" is extremely useful for not accidentally committing
things.  I've never seen anybody use is except me, and it's a bit
cumbersome at first.  It shows a list of all files; then I select
option 5 to go through them chunk by chunk and apply or skip them.
It's great for finding leftovers of experiments or debug code, and
for separating topics.


Dominik ^_^  ^_^


Dominik Vogt

Reply via email to