浏览代码

Explain multiple subtree remotes

Willy-JL 1 年之前
父节点
当前提交
f232070e06
共有 1 个文件被更改,包括 11 次插入0 次删除
  1. 11 0
      README.md

+ 11 - 0
README.md

@@ -30,3 +30,14 @@ To make updating more manageable, we have added some scripts on top of subtrees:
 - add a new app with `.utils/add-subtree.sh <path> <repo url> <branch> [subdir]`, this will pull the history and create `path/.gitsubtree` to remember the url, branch and subdir
 - run `.utils/update-subtree.sh <path>` to pull updates for a subtree
 - or run `.utils/bulk-update-subtrees.sh` to do it for all subtrees
+
+Most apps have a remote subtree URL for both the original repository, and for any forks / other sources such as [@xMasterX's pack](https://github.com/xMasterX/all-the-plugins).
+Unfortunately, this process is currently manual as our helper scripts don't cover it. We instead:
+- add from one remote
+- delete the directory in a commit
+- add from another remote
+- replace the new directory with the previous one
+- compare the changes between forks and keep the best of both
+- add any eventual edits we have on our end
+If you're an app developer wanting to add your app, or a third party who wants to include something they find useful, you don't need to bother with this cumbersome process.
+We will do it for you, just add from a single remote URL, or simply make an issue requesting an app to be added!