Synchronous development with open source projects & codereview & pull request & Fork how to pull the original warehouse

scene 1

In relatively large team development , In order to ensure code quality and technical managers can understand the logic of the whole code , The code needs to have CodeReview link .

scene 2

If open source projects are used as the basis for development ,fork After a period of time, the source code has been updated or modified , Not synchronizing is a loss for the team .

scene 3

Scene 2 If open source projects are found in development bug, Or new functions are added , It can also be done through Pull Request Make your own contribution to the open source project .

Method

fork The main code base （ Open source library ）, And put yourself fork The warehouse of clone To local

1. View the currently associated remote warehouse , This warehouse is just fork Of

E:\linuxdir\php\xxx>git remote -v
origin  [email protected].com:liaosp/xxx.git (fetch)
origin  [email protected].com:liaosp/xxx.git (push)

2. Associated with primary warehouse （ Open source library ） Add an upstream warehouse （upstream ）.

git remote add upstream [email protected].com:xxx/xxx.git

View the remote library at this time ：

E:\linuxdir\php\dingdongShop>git remote -v
origin  [email protected].com:liaosp/xxx.git (fetch)
origin  [email protected].com:liaosp/xxx.git (push)
upstream        [email protected].com:xxx/xxx.git (fetch)
upstream        [email protected].com:xxx/xxx.git (push)

Synchronize master warehouse

git pull upstream master

We can't merge

git pull upstream master --allow-unrelated-histories

E:\linuxdir\php\dingdongShop>git pull upstream master
remote: Enumerating objects: 30, done.
remote: Counting objects: 100% (30/30), done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 21 (delta 16), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (21/21), 4.79 KiB | 75.00 KiB/s, done.
From gitee.com:ZhongBangKeJi/CRMEB
 * branch              master     -> FETCH_HEAD
   ec68235a..a52078d2  master     -> upstream/master
Updating ec68235a..a52078d2
Fast-forward
 crmeb/app/services/coupon/StoreCouponUserServices.php       | 2 +-
 crmeb/app/services/product/product/StoreProductServices.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Perform consolidation regularly , Ensure the code submitted by other colleagues in the main warehouse , It can also be developed synchronously with open source projects .

codeReview

stay git Control panel （github/gitlab） There is one PullRequest The options can be submitted by yourself commit Merge to main warehouse