merge in github

[Luke Inman-Semerau]

I've started trying out using the github merge button for the selenium project, because not it does what we want it to do (squash / rebase).  (65a6604a89d9f6746f629cf76a3e7431f4daa3f7)

The slight difference to our workflow that we did before is it does not amend the commit with a signoff. However it does put the merger as the "Owner" of the commit.

In the github UI one can see the Owner as the smaller icon imposed on the bottom right corner of the "Author" image of the commit.

Command line `git log` does not show the Owner by default. If you would like to see that also you need to do `git log --pretty=fuller`  or you can set the fuller format by default in your git config `git config --global format.pretty fuller`

If you have concerns feel free to chime in.

-Luke

[⇜Krishnan Mahadevan⇝]

Luke,

I was just curious to know, how did you deal with GitHub Merge button introducing the merge bubble commits when you accept PRs by clicking on the Merge button ?

I looked at the commit history and it shows a very nice straight line, but in other projects wherein they are using the merge button [ atleast I would like to think so], I don't see that straight line [ I was thinking that the selenium committers were explicitly ensuring that the deliveries are always fast forward merges by rebasing the PR branch if required ].

the commit history from another project which I think relies on the merge button for accepting PRs.

The commit history from Selenium [it still looks like a straight line ]

I was hoping you could please help share how this was done.

Thanks & Regards
Krishnan Mahadevan

"All the desirable things in life are either illegal, expensive, fattening or in love with someone else!"
My Scribblings @ http://wakened-cognition.blogspot.com/

My Technical Scribbings @ http://rationaleemotions.wordpress.com/

--
You received this message because you are subscribed to the Google Groups "Selenium Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to selenium-develo...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/selenium-developers/CAL97Zu4AtwivquX7NaXGn%3DtHrvubKPOT_u-p9EjY6bEnmC0Owg%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

[Luke Inman-Semerau]

github.com released a secondary merge functionality:

https://github.com/blog/2141-squash-your-commits

I don't believe it has hit github enterprise yet (at least not for me)

To view this discussion on the web visit https://groups.google.com/d/msgid/selenium-developers/CANikZLnSxmBERYiKwNZqGFxBgdVOXKbggvW_MJTjEkMK193ELg%40mail.gmail.com.