← Back to team overview

maria-discuss team mailing list archive

Re: Branch 10.4 conflict


Hi Otto,

Sorry about that. I made typing error on branch number on my push command
and I was also surprised branch protection allowed it.

R: Jan

On Sun, 29 Jan 2023, 03:36 Otto Kekäläinen, <otto@xxxxxxxxxxxxxx> wrote:

> Hello!
> My local branch of 10.4 was at commit
> https://github.com/MariaDB/server/commit/9335e2a2b1d555d2ad83ae6f44acb8467c495b72
> and pulling from upstream causes now conflicts.
> Did somebody (Jan?) overwrite git history recently for mariadb-server
> or what might be going on?
> - Otto