{"thread":{"id":"25920","subject":"git p4 submit always tries to re-apply every patch","startedAt":"2010-12-02T02:30:39Z","lastAt":"2010-12-02T09:36:31Z","messageCount":2,"participants":["thussvm","Tor Arvid Lund"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"157072","messageId":"1291257039313-5794578.post@n2.nabble.com","threadId":"25920","inReplyTo":null,"subject":"git p4 submit always tries to re-apply every patch","fromName":"thussvm","fromEmail":"thuss@volunteermatch.org","sentAt":"2010-12-02T02:30:39Z","receivedAt":"2010-12-02T02:30:39Z","isPatch":false,"sender":{"key":"thuss@volunteermatch.org","avatar":null},"body":"\nWhenever I run a git p4 submit after a git pull from the origin it tries to\nre-apply every commit, even ones that were already submitted previously\n(which results in self generated conflicts). What's interesting is that this\nworks:\n\ngit p4 submit <--- submit some changes\ngit p4 submit <--- no changes to submit, so it recognizes that it's up to\ndate\n\nbut as soon as I throw in a git pull origin master (even if there is nothing\nnew on the origin) it loses track and on the next submit it tries to\nre-apply EVERYTHING. For example:\n\ngit p4 submit <--- no changes to submit\ngit pull origin master <--- no activity on the git server side so no changes\napplied\ngit p4 submit <--- tries to re-apply all changes that were already submitted\nearlier\n\nIs git pull origin master somehow wiping out git p4's notion of which\nchanges have been applied and which haven't?\n-- \nView this message in context: http://git.661346.n2.nabble.com/git-p4-submit-always-tries-to-re-apply-every-patch-tp5794578p5794578.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"157098","messageId":"AANLkTikiGd1dr2s8kxqPkt0k6Pncr39zR3+ek8Y1BonJ@mail.gmail.com","threadId":"25920","inReplyTo":"1291257039313-5794578.post@n2.nabble.com","subject":"Re: git p4 submit always tries to re-apply every patch","fromName":"Tor Arvid Lund","fromEmail":"torarvid@gmail.com","sentAt":"2010-12-02T09:36:31Z","receivedAt":"2010-12-02T09:36:31Z","isPatch":false,"sender":{"key":"torarvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/439758?v=4"},"body":"On Thursday, December 2, 2010, thussvm <thuss@volunteermatch.org> wrote:\n>\n> Whenever I run a git p4 submit after a git pull from the origin it tries to\n> re-apply every commit, even ones that were already submitted previously\n> (which results in self generated conflicts).\n\nTry \"git p4 sync\" before submitting.\n\n    -- Tor Arvid\n\n-- \n   -- Tor Arvid\n"}]}