Two clarifications -
On Tue, May 16, 2023 at 03:46:27PM +0300, Konstantin Khomoutov wrote:
[...]
> Ah, that might indeed easily explain the observed behavior: `git rebase`
> textually applies each commit from those your branch has compared to the
> "base" branch, one-by-one, and each application m
On Mon, May 15, 2023 at 03:22:09PM -0700, Dan Stromberg wrote:
> But in summary, how can I get the merge conflict to go away? I'm surprised
> that the
> add+commit+rebase --continue isn't enough to deal with that file.
>
>
> It turned out I needed to:
> 2715 git add requirements.txt.m4
> 27
