← Back to team overview

maria-discuss team mailing list archive

Thread
Date

Branch 10.4 conflict

To: maria-discuss@xxxxxxxxxxxxxxxxxxx, Sergei Golubchik <serg@xxxxxxxxxxx>, Jan Lindström <jan.lindstrom@xxxxxxxxxxx>
From: Otto Kekäläinen <otto@xxxxxxxxxxxxxx>
Date: Sat, 28 Jan 2023 17:36:09 -0800

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

Follow ups

Re: Branch 10.4 conflict
From: Jan Lindström, 2023-01-30
Re: Branch 10.4 conflict
From: Sergei Golubchik, 2023-01-29