Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jaxrs-dev] PR Merge Style
I also have slight preference for B or C, depending on the actual changes in the commit(s). But I'm fine with all options after all.

Cheers
Alessio

On Sat, Feb 24, 2018 at 4:53 PM, Derek Moore <derek.p.moore@xxxxxxxxx> wrote:
The problem with (B) is it makes a blanket decision to squash all commits into one commit. While this is often appropriate for a number of feature branches, separate logically compounding commits is also often appropriate for merged feature branches.

I teach my teams to rebase their feature branches and to use fast-forward merges so we can create linear histories in our destination branches.

We aren't anal about it, because sometimes it is just easiest to accept merge commits, but sometimes developers don't have the patience or experience to pull off clean histories while they're still learning, so a little bit of social pressure always helps to accelerate adoption and learning of best practices.

Checking out the prevailing habits in Linus's Linux repo or Junio's Git repo is always insightful.

Cheers,

Derek

On Fri, Feb 23, 2018 at 3:48 PM Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com> wrote:
Hi,

 I also have a slight preference towards (B), but I don’t feel strongly about it. Let’s just decide on one strategy, we can always review this later.

— Santiago 


On Feb 23, 2018, at 1:12 PM, Christian Kaltepoth <christian@xxxxxxxxxxxx> wrote:

Hi,

we are mostly using (B) in the MVC specification which works great. However, if the individual commits are well structure and the pull request is nontrivial, I also use (C) from time to time.

Christian

2018-02-23 19:02 GMT+01:00 Markus KARG <markus@xxxxxxxxxxxxxxx>:

Hello Fellow Committers,

 

some PRs I am assigned with have been approved finally, and I want to merge them now.

 

Github allows me to use MERGE, SQUASH, and REBASE style.

 

I think we should agree on using the same style always. Which one?

 

(A) MERGE

 

(B) SQUASH

 

(C) REBASE

 

My personal favorite is (A) MERGE as it provides a verbose visual separation of the contributions, but maybe you like it differently?

 

Your comments please! :-)

 

-Markus


_______________________________________________
jaxrs-dev mailing list
jaxrs-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jaxrs-dev




--
Christian Kaltepoth

_______________________________________________
jaxrs-dev mailing list
jaxrs-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jaxrs-dev

_______________________________________________
jaxrs-dev mailing list
jaxrs-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jaxrs-dev

_______________________________________________
jaxrs-dev mailing list
jaxrs-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/jaxrs-dev


Back to the top