git/list[1] front-page[2] threads[3] people[4] search[5] about
 

subtree merging fails

From
SLStavros Liaskos <st.liaskos@gmail.com>
Date
Feb 7, 2017, 08:16 UTC
Message-ID
<CAEXhnECi3LvSA92dSjL5PZ1Lx9p1PWELS04nmfJW=8K9o4T-0Q@mail.gmail.com>

Following the instructions here: https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging will lead to an error.

In particular, if the subtree is merged and then updated, this command that is supposed to update the local subtree fails with a fatal: refusing to merge unrelated histories error.

$ git merge --squash -s subtree --no-commit rack_branch
A workaround could be using the --allow-unrelated-histories option

$ git merge --squash --allow-unrelated-histories -s subtree --no-commit rack_branch

But this completely destroys my project by pushing the subtree contents into a completely irrelevant directory in my project (no in the subtree).

Any ideas??
https://github.com/git/git-scm.com/issues/896#issuecomment-277587626
Next: Samuel Lijin
Message 1 of 4 in “subtree merging fails”
  1. Stavros LiaskosFeb 7, 2017
  2. Samuel LijinFeb 7, 2017
  3. David AguilarFeb 7, 2017
  4. Stavros LiaskosFeb 8, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.