Re: Fast-forward able commit, otherwise fail

2016-07-08 Thread David Lightle
I've been trying to think of just what to say in response, so it has taken me some time as well as I've been experimenting with our workflow to try some alternate approaches while we still can. In your above scenario with Alice & Bob, wouldn't that same issue come up in _any_ rebase workflow (--ff

Fast-forward able commit, otherwise fail

2016-06-20 Thread David Lightle
Hello, I am trying to build a git workflow in our enterprise and am almost evenly torn between a "rebase workflow" and git-flow (which uses merge instead of rebase, obviously). We are using Bitbucket for pull requests as code reviews (right or wrong). I apologize if my inexperience with git show