Phillip Wood <phillip.wood123@xxxxxxxxx> writes: >> OK. It would probably have been unnecessary to rebase only for this >> update. > > I agree the conflict is easy to solve but GitGitGadget gets upset and > refuses to run the ci if it cannot merge the branch into master Heh. TIL. That's a tad unfortunate that we have to let the tail wag the dog, but OK.
