Skip to content

Instantly share code, notes, and snippets.

@112KA

112KA/git subtree.md

Last active February 4, 2022 07:31
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save 112KA/442a8ec8489ce4f38fc793b87719a00f to your computer and use it in GitHub Desktop.
Save 112KA/442a8ec8489ce4f38fc793b87719a00f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git subtree.md

削除

filter-branch

Troubles

○

Can't squash-merge: 'foo' was never added.

最初のgit subtree addがうまくいってなかった。
存在するディレクトリを指定するのはだめ。

○ remoteでconflict

$ git subree pull
Working tree has modifications.  Cannot add.

pull→conflict解消→push で解決できた
参考）
https://qiita.com/__mick/items/e027cc3941ac52743bd5#example-2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment