Re: git merge commits staged files (when two trees are identical)

On Wed, Dec 20, 2017 at 3:43 AM, Andreas Krey wrote: > Hi everybody, > > we just stumbled over a situation in which a merge commits > staged changes into the merge commit. This happens when the > merged-in branch does have commits ('main') but has the same > tree ('--allow-empty') as the merge bas

git merge commits staged files (when two trees are identical)

Hi everybody, we just stumbled over a situation in which a merge commits staged changes into the merge commit. This happens when the merged-in branch does have commits ('main') but has the same tree ('--allow-empty') as the merge base: git init echo eins >a git add a git commit -m