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
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
2716 git commit -m 'Merge conflicts' requirements.txt.m4
2717 git rebase --c
On Monday, May 15, 2023 at 12:09:41 PM UTC-7 Dan Stromberg wrote:
On Monday, May 15, 2023 at 11:17:36 AM UTC-7 Konstantin Khomoutov wrote:
On Thu, May 11, 2023 at 11:02:44AM -0700, Dan Stromberg wrote:
> I put together this little script to show what I'm seeing.
>
> The comments pretty much
On Monday, May 15, 2023 at 11:17:36 AM UTC-7 Konstantin Khomoutov wrote:
On Thu, May 11, 2023 at 11:02:44AM -0700, Dan Stromberg wrote:
> I put together this little script to show what I'm seeing.
>
> The comments pretty much say what's going on. But in summary, how can I
> get the merge co
On Thu, May 11, 2023 at 11:02:44AM -0700, Dan Stromberg wrote:
> I put together this little script to show what I'm seeing.
>
> The comments pretty much say what's going on. But in summary, how can I
> get the merge conflict to go away? I'm surprised that the
> add+commit+rebase --continue is
I put together this little script to show what I'm seeing.
The comments pretty much say what's going on. 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.
#!/bin/bash
set -eux
set -o pipefail