The behavior is surprising, because I haven't seen git merge do something wrong since ages if ever. Am 20.01.25 um 09:16 schrieb Postolache Andreas: > A:During the auto-merge it added Text from an 5 month old commit, > that was the 6th newest commit and the 4th oldest. This text was not > present on either the up-to date main branch or my working branch. > This was text from my first commit on the file, which was an .md > file. Without concrete data, it is difficult to asses where you started and what the result should be. Let's start with some `git log` output so that we all know what the shape of the commit graph is. We'll have to work from there or maybe you already know what is going on when you prepare it. Show the output of git log --graph --oneline --decorate --boundary main...mybranch -- file.md Replace "main" by the branch name that you called "the up-to-date main branch", "mybranch" by "my working branch", and "file.md" by the path(spec) of the file in question. Mind the three dots and the dash-dash. -- Hannes
