# git p4 submit always tries to re-apply every patch 2 messages from 2010-12-02 to 2010-12-02. Participants: thussvm, Tor Arvid Lund. Thread: https://gitlist.dev/t/25920 ## thussvm, 2010-12-02 02:30 Subject: git p4 submit always tries to re-apply every patch Message-ID: <1291257039313-5794578.post@n2.nabble.com> URL: https://gitlist.dev/e/1291257039313-5794578.post%40n2.nabble.com ``` 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). What's interesting is that this works: git p4 submit <--- submit some changes git p4 submit <--- no changes to submit, so it recognizes that it's up to date but as soon as I throw in a git pull origin master (even if there is nothing new on the origin) it loses track and on the next submit it tries to re-apply EVERYTHING. For example: git p4 submit <--- no changes to submit git pull origin master <--- no activity on the git server side so no changes applied git p4 submit <--- tries to re-apply all changes that were already submitted earlier Is git pull origin master somehow wiping out git p4's notion of which changes have been applied and which haven't? -- View this message in context: http://git.661346.n2.nabble.com/git-p4-submit-always-tries-to-re-apply-every-patch-tp5794578p5794578.html Sent from the git mailing list archive at Nabble.com. ``` ## Tor Arvid Lund, 2010-12-02 09:36 Subject: Re: git p4 submit always tries to re-apply every patch Message-ID: URL: https://gitlist.dev/e/AANLkTikiGd1dr2s8kxqPkt0k6Pncr39zR3%2Bek8Y1BonJ%40mail.gmail.com In-Reply-To: <1291257039313-5794578.post@n2.nabble.com> ``` On Thursday, December 2, 2010, thussvm 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 ```