Hi, I'm using git submodule to pull some third-party config templates into my git tree, using the following: git fetch foobar-github master git subtree pull --prefix software/files/perimiter_mail/foobar-github foobar-github master --squash Now, the question is, when the upstream makes a new commit can I force pull that commit and make git overwrite any changes I've made in the subtree. At the moment I get bitter complaints from git, e.g. : CONFLICT (content): Merge conflict in.... Automatic merge failed; fix conflicts and then commit the result. Basically, I want to make myslef an update script that force-pulls the latest upstream repo and then the script will take care of making the necessary modifications (the upstream puts placeholders in their repo, so my script would take care of replacing the placeholders with the real values so that everything works again) Thanks !
