On Thursday, December 2, 2010, thussvm <thuss@xxxxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html