我想将此功能/react-intl分支与git合并,如下所述=> https://github.com/kriasoft/react-starter-kit/blob/feature/react-intl/docs/recipes/how-to-integrate-react-intl.md
我首先克隆了最新版本的React Starter Kit (RSK),如下所述=> https://github.com/kriasoft/react-starter-kit/blob/feature/redux/docs/getting-started.md
$ git clone -o react-starter-kit -b master --single-branch \
https://github.com/kriasoft/react-starter-kit.git MyApp
$ cd MyApp集成React Intl的第一步是"merge feature/react-intl branch with git“
我该如何做到这一点?
我尝试过
git merge --no-ff feature/react-intl响应:
merge: feature/react-intl - not something we can merge.谢谢您抽时间见我!
发布于 2017-10-04 13:28:50
由于本地只有源/主分支(克隆时使用--single-branch标志),因此拉取feature/react-intl分支。
$ git remote -v
# i guess your remote name is 'react-starter-kit' instead 'origin'
$ git pull react-starter-kit feature/react-intl或者,获取远程react-starter-kit,然后将feature/react-intl与本地分支master合并。
$ git fetch react-starter-kit
$ git merge feature/react-intlhttps://stackoverflow.com/questions/46557546
复制相似问题