[ 
https://issues.apache.org/jira/browse/SLIDER-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15108870#comment-15108870
 ] 

Josh Elser commented on SLIDER-977:
-----------------------------------

bq. If the work was done by 3 people, then should it not show up like that in 
the history? I can rebase the original PR to develop and apply your changes on 
top of it.

If you want to rebase the work on top of develop so that I can do a non-ff 
merge, I'd be ok with that, but I still prefer seeing a single commit for the 
collective work (as I merged it).

bq. should it not show up like that in the history

I don't believe we have any hard rules in Slider for attribution. As I already 
said, I goofed up by not mentioning you, Siyuan, and Jean-Baptiste in the 
commit message. I am happy to change that, but I do not feel that having the 
original 20+ commits is worthwhile for one "change". Personally, I don't really 
care how you got to the point you did -- I'm more interested in the final 
app-package contribution (which is what the squash represents) while your 
pull-request still retains the original "source" with commits.

> KOYA integration IP clearance
> -----------------------------
>
>                 Key: SLIDER-977
>                 URL: https://issues.apache.org/jira/browse/SLIDER-977
>             Project: Slider
>          Issue Type: Sub-task
>            Reporter: Thomas Weise
>            Assignee: Josh Elser
>             Fix For: Slider 0.91
>
>
>  http://incubator.apache.org/ip-clearance/



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Reply via email to