Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-13 Thread Jaikiran Pai
It's typically recommended not to include such merge commits (since they 
usually pollute the commit history) and instead use the "git rebase" 
approach. However, no harm is done with the merge commit. It essentially 
is one additional commit with "pointers" to other commits. In this 
specific case this merge commit just points to the previous commit that 
was already in the upstream repo. We won't have to revert anything.


-Jaikiran


On 13/07/17 5:47 AM, Maarten Coene wrote:

I remember IntelliJ was saying something about a failed commit asking me to 
merge to the last revision.
I still don't understand why this results in 2 commits. (my knowledge of git is 
very limited as you can see)
But I guess this is ok? Or should it be reverted somehow?

Maarten

   Van: Jaikiran Pai 
  Aan: dev@ant.apache.org
  Verzonden: woensdag 12 juli 17:53 2017
  Onderwerp: Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 
'origin/master'

I'm guessing that while committing the fix for IVY-1404 you probably did

a "git merge" against latest master of upstream, which created this
merge commit.


-Jaikiran


On 12/07/17 1:45 PM, Maarten Coene wrote:

Any idea where this commit comes from?I didn't touch any of these files as far 
as I know...
Maarten

   
- Doorgestuurd bericht -

   Van: "maart...@apache.org" 
   Aan: notificati...@ant.apache.org
   Verzonden: woensdag 12 juli 10:06 2017
   Onderwerp: [2/2] ant-ivy git commit: Merge remote-tracking branch 
'origin/master'
 
Merge remote-tracking branch 'origin/master'



Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1a36ae09
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1a36ae09
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1a36ae09

Branch: refs/heads/master
Commit: 1a36ae09d2848d687895532acf46531437721692
Parents: 585a702 dcaacf4
Author: Maarten Coene 
Authored: Wed Jul 12 10:05:54 2017 +0200
Committer: Maarten Coene 
Committed: Wed Jul 12 10:05:54 2017 +0200

--
   .../xml/XmlModuleDescriptorParserTest.java  | 56 
   .../hello/test-ivy-extends-absolute.xml| 25 +
   .../plugins/parser/xml/foo%2Fbar/parent-ivy.xml | 27 ++
   3 files changed, 108 insertions(+)
--




 


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







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



[GitHub] ant-ivy pull request #:

2017-07-13 Thread nlalevee
Github user nlalevee commented on the pull request:


https://github.com/apache/ant-ivy/commit/6f22f4b49c2a3a59840d28e6cbe0c37a56ab1f90#commitcomment-23071422
  
Probably. And rather than asking for it, it is often better to suggest a 
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