Matt, I'm trying to understand what happened here...
I did a commit from Eclipse/EGit and choose "Commit and Push". What is the problem you are trying to solve? Gary On Sun, Aug 31, 2014 at 2:55 PM, Matt Sicker <[email protected]> wrote: > Might I recommend in the future how to reconcile this problem: > git push (failed due to out of date tree) > git pull > git rebase > git push > > That way you can get away without adding merge commits. Really, the only > time merge commits are useful is when you've already pushed your branch or > repository elsewhere. If it's still local, you can do "git rebase" to clean > the history a bit and prevent additional commits. > > Here's some more info: > > http://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge > > > ---------- Forwarded message ---------- > From: <[email protected]> > Date: 31 August 2014 13:44 > Subject: [3/4] git commit: Merge branch 'master' of > https://git-wip-us.apache.org/repos/asf/logging-log4j2 > To: [email protected] > > > Merge branch 'master' of > https://git-wip-us.apache.org/repos/asf/logging-log4j2 > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > Commit: > http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f836dad9 > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f836dad9 > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f836dad9 > > Branch: refs/heads/master > Commit: f836dad9ba5b6b141462e1a9f33ec60a351917ff > Parents: 7271488 5808022 > Author: Gary Gregory <[email protected]> > Authored: Sun Aug 31 14:43:03 2014 -0400 > Committer: Gary Gregory <[email protected]> > Committed: Sun Aug 31 14:43:03 2014 -0400 > > ---------------------------------------------------------------------- > pom.xml | 8 -------- > 1 file changed, 8 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f836dad9/pom.xml > ---------------------------------------------------------------------- > > > > > -- > Matt Sicker <[email protected]> > -- E-Mail: [email protected] | [email protected] Java Persistence with Hibernate, Second Edition <http://www.manning.com/bauer3/> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/> Spring Batch in Action <http://www.manning.com/templier/> Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory
