Explicit `merge --ff` is not supported, and a plain `merge` that would fast forward is incorrectly projected to create a merge commit

[initialcommit-com]

Explicit `merge --ff` is not supported, and a plain `merge` that would fast forward is incorrectly projected to create a merge commit

[initialcommit-io]

@hlovdal Thanks for reporting this and for the super detailed description! I was able to reproduce this on my end - it looks like a bug when merging from a remote tracking branch. You're right it should just do the fast forward by default and if the user wants to supply the --no-ff then it will create the merge commit.

I will dig deeper today and hopefully resolve this in a new release tonight.

[initialcommit-io]

(fyi regular fast forward merges between two non remote-tracking branches work and are something I tested, but didn't test merging a remote-tracking branch :D)

[initialcommit-io]

@hlovdal Just pushed a fix for this in git-sim 0.1.7. Remote tracking branches can now be merged as a fast-forward and remote tracking branch names will also display in commands that traverse history like git-sim log.

Please upgrade to git-sim 0.1.7 by running:

pip install git-sim --upgrade

Then test it out and let me know if it works for you! =D

[hlovdal]

Looks good.