本贴最后更新于 564 天前,其中的信息可能已经时异事殊
点击展开正文内容

通过源代码合并,添加最新的代码到本地,编译打包发布

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git remote -v
origin  https://github.com/xx/solo.git (fetch)
origin  https://github.com/xx/solo.git (push)

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git remote add b3solo https://github.com/b3log/solo.git

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git remote -v
b3solo  https://github.com/b3log/solo.git (fetch)
b3solo  https://github.com/b3log/solo.git (push)
origin  https://github.com/xx/solo.git (fetch)
origin  https://github.com/xx/solo.git (push)

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git fetch b3solo
remote: Counting objects: 573, done.
remote: Compressing objects: 100% (26/26), done.
remote: Total 573 (delta 205), reused 233 (Receiving objectdels:  ta 2902),5% (5                                                                                                                45/573), pack-reused 335
Receiving objects: 100% (573/573), 92.48 KiB | 5.00 KiB/s, done.
Resolving deltas: 100% (274/274), completed with 91 local objects.
From https://github.com/b3log/solo
 * [new branch]      2.3.0-dev  -> b3solo/2.3.0-dev
 * [new branch]      master     -> b3solo/master
 * [new tag]         v2.2.0     -> v2.2.0

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git branch -av
* master                   cc549cc share/logo  //本地个人版本
  remotes/b3solo/2.3.0-dev 1d34d0a :arrow_up: 升级 Markdown 处理引擎   
  remotes/b3solo/master    1d34d0a :arrow_up: 升级 Markdown 处理引擎   //b3主分支版本
  remotes/origin/2.2.0-dev 3767149 :art: cmd release
  remotes/origin/HEAD      -> origin/master
  remotes/origin/master    cc549cc share/logo

rzx@rzx MINGW64 /d/ideaProjects/solo (master)
$ git checkout master
M       src/main/webapp/skins/9IPHP/article.ftl
Already on 'master'
Your branch is up-to-date with 'origin/master'.

之后直接在 IDEA 中 git-merge, 选择要合并的版本 Merge 就可以

感谢    关注    收藏    赞同    反对    举报    分享