netbeans-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer
Date Thu, 01 Jan 1970 00:00:00 GMT
rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer
URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339822005
 
 
   Thanks Javier,
   
   I didn?t know about that.  Is this something committers do? Or something I was meant to
do as a contributor?  
   
   I mis-spoke in my prior comment, what I was concerned about was squashing a conflict merge,
i.e. the additional commits are to do with sorting out the conflict with base (I don?t know
why GitHub made me do 2 commits.  I read somewhere git can get confused with how it tracks
conflicts if you mess around with squashing.
   
   Is there something else I can do to finish this as a contributor?
   
   Cheers
   Ross
   
   > On 27 Oct 2017, at 5:40 am, Javier A. Ortiz Bultron <notifications@github.com>
wrote:
   > 
   > In all my GitHub projects I can configure how PR are handled. From allowing all types
(merge, squash, etc.) to selecting one or some of them.
   > 
   > If squashing is the preferred way it should be probably the only option. Usually the
person(s) configured to merge to trunk can choose which one.
   > 
   >  <https://user-images.githubusercontent.com/2817343/32070839-27439ce8-ba53-11e7-8b4b-0b97e2136695.png>
   > ?
   > You are receiving this because you authored the thread.
   > Reply to this email directly, view it on GitHub <https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339760312>,
or mute the thread <https://github.com/notifications/unsubscribe-auth/AXKC2P8DbNMsAXydNECz8VBYZqJkHB1-ks5swNISgaJpZM4P-f2H>.
   > 
   
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message