On Fri, Jun 11, 2021 at 11:22 AM Richard Shaw <hobbes1069(a)gmail.com> wrote:
First time I've seen this. I assume this is because the merge would not be 100% clean
but I don't actually know what happens in the background so I wanted to ask here
first.
Do I try to merge? Or try rebase?
Try to rebase, then it'll turn green.
--
真実はいつも一つ!/ Always, there's only one truth!