On 06-11-2011 19:41, Jesse Phillips wrote:
On Sat, 05 Nov 2011 19:16:01 -0700, Jonathan M Davis wrote:
Rebasing, I understand. Rebasing happens often enough in pull requests.
It affects branches that way, not master, so I don't think that it's
really all that big a deal - particularly when such branchs frequently
created just for that pull request and are deleted aftewards.
I agree it probably isn't a big deal, but it _is_ a rewrite and _does_
have some implications. If you merge with --rebase, that branch is
_dead_. As pull requests are public this could cause confusion, but
mostly it should be something to be aware of.
It maybe reasonable, but as you say, why do it if you don't get to use
the merge button.
I should clarify that this entire post was directed at *normal git pull
operations*. Not merging of pull requests. Those will (and should!)
result in a merge commit to make it easier to see when in history a pull
request was merged in.
- Alex