Re: Git workflow

[Stefan Bodewig]

On 2015-01-11, Nicolas Lalevée wrote:

> By the way, is there any way to close manually the pull requests in
> github ? The only way is to reference it in a git commit ?

Probably some infra folks can since you need write access to the github
apache organization.

You can create empty commits (--allow-empty), I've done so for one
invalid PR already.

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant-ivyde pull request: Fix for the user-selected configurations n...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/ant-ivyde/pull/1


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant-ivy pull request: Lets ssh-based resolvers use an ~/.ssh/confi...

[nlalevee]

Github user nlalevee commented on the pull request:

https://github.com/apache/ant-ivy/pull/3#issuecomment-69492990
  
merged. Thanks for the patch!


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

Re: Git workflow

[Nicolas Lalevée]

By the way, is there any way to close manually the pull requests in github ? 
The only way is to reference it in a git commit ?

Nicolas

> Le 11 janv. 2015 à 13:17, Nicolas Lalevée  a 
> écrit :
> 
> 
>> Le 7 janv. 2015 à 05:57, Stefan Bodewig  a écrit :
>> 
>> On 2015-01-07, Nicolas Lalevée wrote:
>> 
>>> For instance, to get commits from one branch to the other, I have seen
>>> two ways: via merge or via cherry-pick.
>>> Since our branches are meant to diverge à some point, I think using
>>> cherry-pick should be used, right ?
>> 
>> Alternatively develop the feature on a third branch, merge that branch
>> into both others and delete the feature branc afterwards.
> 
> Yep, that is a great feature of git too.
> 
>> 
>>> And about merging pull request, there is the direct pull, for instance:
>>> git pull https://github.com/jbaruch/ant-ivy
>>>  patch-1
>> 
>>> And there is the rebase way, exemple:
>> 
>> The approach I've seen taken a lot on github is to have the submitter of
>> the pull request rebase (and squash) the PR before you merge it.
>> Squashing means you juts get a single clean commit rather than a
>> sequence of refinements.
> 
> Ok.
> I find it strange that there is not a simpler way to do it from the merger 
> point of view.
> 
> Nicolas
> 


-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

Re: Git workflow

[Nicolas Lalevée]

> Le 7 janv. 2015 à 05:57, Stefan Bodewig  a écrit :
> 
> On 2015-01-07, Nicolas Lalevée wrote:
> 
>> For instance, to get commits from one branch to the other, I have seen
>> two ways: via merge or via cherry-pick.
>> Since our branches are meant to diverge à some point, I think using
>> cherry-pick should be used, right ?
> 
> Alternatively develop the feature on a third branch, merge that branch
> into both others and delete the feature branc afterwards.

Yep, that is a great feature of git too.

> 
>> And about merging pull request, there is the direct pull, for instance:
>> git pull https://github.com/jbaruch/ant-ivy
>>  patch-1
> 
>> And there is the rebase way, exemple:
> 
> The approach I've seen taken a lot on github is to have the submitter of
> the pull request rebase (and squash) the PR before you merge it.
> Squashing means you juts get a single clean commit rather than a
> sequence of refinements.

Ok.
I find it strange that there is not a simpler way to do it from the merger 
point of view.

Nicolas


-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant-ivy pull request: The default subject is `bintray`, not 'jcent...

[nlalevee]

Github user nlalevee commented on the pull request:

https://github.com/apache/ant-ivy/pull/5#issuecomment-69492417
  
merged. Thanks !


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org