From: Tor Arvid Lund <torarvid@gmail.com>
Date: Thu, 02 Dec 2010 09:36:31 GMT
Subject: Re: git p4 submit always tries to re-apply every patch
Message-ID: <AANLkTikiGd1dr2s8kxqPkt0k6Pncr39zR3+ek8Y1BonJ@mail.gmail.com>
In-Reply-To: <1291257039313-5794578.post@n2.nabble.com>

On Thursday, December 2, 2010, thussvm <thuss@volunteermatch.org> wrote:
>
> Whenever I run a git p4 submit after a git pull from the origin it tries to
> re-apply every commit, even ones that were already submitted previously
> (which results in self generated conflicts).

Try "git p4 sync" before submitting.

    -- Tor Arvid

-- 
   -- Tor Arvid