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. -- 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