Return-Path: X-Original-To: apmail-logging-log4j-dev-archive@www.apache.org Delivered-To: apmail-logging-log4j-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D4CA11ED3 for ; Mon, 1 Sep 2014 04:49:31 +0000 (UTC) Received: (qmail 98038 invoked by uid 500); 1 Sep 2014 04:49:31 -0000 Delivered-To: apmail-logging-log4j-dev-archive@logging.apache.org Received: (qmail 97975 invoked by uid 500); 1 Sep 2014 04:49:31 -0000 Mailing-List: contact log4j-dev-help@logging.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Log4J Developers List" Reply-To: "Log4J Developers List" Delivered-To: mailing list log4j-dev@logging.apache.org Received: (qmail 97964 invoked by uid 99); 1 Sep 2014 04:49:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2014 04:49:31 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of boards@gmail.com designates 209.85.218.44 as permitted sender) Received: from [209.85.218.44] (HELO mail-oi0-f44.google.com) (209.85.218.44) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2014 04:49:27 +0000 Received: by mail-oi0-f44.google.com with SMTP id i138so3177278oig.3 for ; Sun, 31 Aug 2014 21:49:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=RLU1ONFTsYNEZuPYNXDNIZ6ljAm3ewr6Q6YWZwT8l04=; b=I2uwqvT3VyMMXlwX+5EUUL3TuKs5NV9rmQ+4I7GvLVMKj+HtZ2+1gwAzsCNdk2/pU8 jRrMIG4OgojJCQppTtKojQJJ0A0QNDJdDkRSvDj9OtnFuv6jsu3xKwv7mvePSI6hADQz EbOM2iYv79psOUw9l7yXjCsFSYl4rEey7saP9M+K6bouY6VOLjUZnOyzTLwBtpF4cqQN js7bgW/9/SZiyVHcsEa4fRfjVZtXGoBS2x2ujrQl4yO6GnWsuicG2uV8meZ6i456jS48 /ejpH0mz2Sf2RA3Dtbd07ZaC3TJmfsRjQlYlwc/vQQoHT41zgvBZUGwGClbjuha30Jgj qnjA== MIME-Version: 1.0 X-Received: by 10.182.20.242 with SMTP id q18mr5183205obe.52.1409546946641; Sun, 31 Aug 2014 21:49:06 -0700 (PDT) Received: by 10.76.175.103 with HTTP; Sun, 31 Aug 2014 21:49:06 -0700 (PDT) In-Reply-To: References: <9216567df342433899cb772e5d180c23@git.apache.org> Date: Sun, 31 Aug 2014 23:49:06 -0500 Message-ID: Subject: Re: [3/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 From: Matt Sicker To: Log4J Developers List Content-Type: multipart/alternative; boundary=e89a8f83a8830c867b0501f9b954 X-Virus-Checked: Checked by ClamAV on apache.org --e89a8f83a8830c867b0501f9b954 Content-Type: text/plain; charset=UTF-8 I believe there is a setting in EGit to automatically rebase before pushing. I'm just used to use it from the command line. If there isn't, no big deal. On 31 August 2014 21:36, Gary Gregory wrote: > 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 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: >> 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: commits@logging.apache.org >> >> >> 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 >> Authored: Sun Aug 31 14:43:03 2014 -0400 >> Committer: Gary Gregory >> 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 >> > > > > -- > E-Mail: garydgregory@gmail.com | ggregory@apache.org > Java Persistence with Hibernate, Second Edition > > JUnit in Action, Second Edition > Spring Batch in Action > Blog: http://garygregory.wordpress.com > Home: http://garygregory.com/ > Tweet! http://twitter.com/GaryGregory > -- Matt Sicker --e89a8f83a8830c867b0501f9b954 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I believe there is a setting in EGit to automatically reba= se before pushing. I'm just used to use it from the command line. If th= ere isn't, no big deal.


On 31 August 2014 21:36, Gary Gregory <garydgregory@gmail.com>= wrote:
Matt,

I'm trying to understand w= hat happened here...

I did a commit from Eclipse/EGit and choo= se "Commit and Push".

What is the problem you are tr= ying to solve?

Gary
<= br>
On Sun, Aug 31, 2014 at 2:55 PM, Matt Sic= ker <boards@gmail.com> wrote:
Might I reco= mmend in the future how to reconcile this problem:
git push (faile= d 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=20 time merge commits are useful is when you've already pushed your branch= =20 or repository elsewhere. If it's still local, you can do "git reba= se" 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-r= ebase-instead-of-git-merge


---------- Forwarded message ----------
F= rom: <ggregory@apache.org>
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: commits@logging.apache.or= g


Merge branch 'master' of https://git-wip-us.apach= e.org/repos/asf/logging-log4j2

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j= 2/repo
Commit: http://git-wip-us.apache.org/repos/asf/log= ging-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 <garydgregory@gmail.com>
Authored: Sun Aug 31 14:43:03 2014 -0400
Committer: Gary Gregory <garydgregory@gmail.com>
Committed: Sun Aug 31 14:43:03 2014 -0400

----------------------------------------------------------------------
=C2=A0pom.xml | 8 --------
=C2=A01 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/loggi= ng-log4j2/blob/f836dad9/pom.xml
----------------------------------------------------------------------




-= -
Matt Sicker <boards@gmail.com>



--



--
Matt Sicker <boards@gmail.com> --e89a8f83a8830c867b0501f9b954--