Scott Taylor

I think that @yuja's suggestion of fixing the author date when a commit becomes non-discardable makes the most sense. This seems to be the most conservative option, since it doesn't...

If the command supports a template to render the information being added to each line, something generic like `jj annotate` (or `jj file annotate`) might be more accurate than `jj...

I've been thinking about this for a while since I've run into this a few times, and I wonder if `jj` can use a simpler approach than Git. The algorithm...

The main reason I was thinking that actually checking the rebased trees match could be better is that it might be correct in more scenarios. Specifically if there's a situation...

I think `--reset-author` already does reset the author timestamp in addition to the name/email, just like in Git. Also, if a commit has no changes and an empty description, the...

I was planning to work on this now that `first_ancestors(x)` is implemented, since the implementation is mostly the same. But now that `parents(x, 3)` means `x---`, I'm not sure whether...

> Now that `first_ancestors` exists, couldn’t the use case presented in the original issue be handled with something like `first_ancestors(M)..M-` ? I don't think that would work, since `first_ancestors(M)` includes...

I have another possible solution that I just thought of, but I'm not sure if it's too complicated. Basically, we introduce a new conflict marker `\\\\\\\` that indicates that the...

> > I think it's a bit easier to read, since if I see a diff where a blank line is added/removed, it has a pretty clear meaning. Whereas if...

I've been thinking about this a bit more, and now I'm thinking @yuja's idea of just restoring the "noeol" state from the existing conflict data is the best approach, rather...