git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Laura Smith <n5d9xq3ti233xiyif2vp@protonmail.ch>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git submodule question
Date: Wed, 27 May 2020 15:01:21 +0000	[thread overview]
Message-ID: <Wri_F6OxTiG7HZNvyVdFwGp7qrTWqC7Oipu214kLQ8gGMhna7SU6AXdm_m8tkDaPlMKtXGXc84TSACkN0tigR9satiLkrXn23bfM331g09U=@protonmail.ch> (raw)

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 !

             reply	other threads:[~2020-05-27 15:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27 15:01 Laura Smith [this message]
2020-06-10  6:02 ` git submodule question Stefan Moch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='Wri_F6OxTiG7HZNvyVdFwGp7qrTWqC7Oipu214kLQ8gGMhna7SU6AXdm_m8tkDaPlMKtXGXc84TSACkN0tigR9satiLkrXn23bfM331g09U=@protonmail.ch' \
    --to=n5d9xq3ti233xiyif2vp@protonmail.ch \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).