From: Tor Arvid Lund <torarvid@gmail.com>
To: thussvm <thuss@volunteermatch.org>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git p4 submit always tries to re-apply every patch
Date: Thu, 2 Dec 2010 10:36:31 +0100 [thread overview]
Message-ID: <AANLkTikiGd1dr2s8kxqPkt0k6Pncr39zR3+ek8Y1BonJ@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2010-12-02 9:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 2:30 git p4 submit always tries to re-apply every patch thussvm
2010-12-02 9:36 ` Tor Arvid Lund [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTikiGd1dr2s8kxqPkt0k6Pncr39zR3+ek8Y1BonJ@mail.gmail.com \
--to=torarvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=thuss@volunteermatch.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).