Mark Adams <[email protected]> writes: > I see, I forgot to pull. > > These were trivial changes: changed a variable name (that is a key word) > and fixed a test that did not compile anymore so I did it directly on > master.
The commit messages says "demonstrates a bug". Is there a bug? What is it? As for non-fast-forward merges, Junio just published a blog post explaining the rationale for maintaining first-parent history and the way to gracefully retry in case of racy integration. (His advice is the same as ours.) He also mentions discussion of a "git rebase --first-parent" feature that would make this process easier. http://git-blame.blogspot.com/2015/03/fun-with-non-fast-forward.html
signature.asc
Description: PGP signature
