git merge

[xgqfrms]

git merge

[xgqfrms]

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

$ git fetch origin
$ git checkout -b feature/app-download-guide origin/feature/app-download-guide

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

$ git fetch origin
$ git checkout origin/master
$ git merge --no-ff feature/app-download-guide

Step 4. Push the result of the merge to GitLab

$ git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

[xgqfrms]

http://gitlab.com/help/user/project/merge_requests/index.md#checkout-merge-requests-locally

[xgqfrms]

https://weather.com/zh-CN/weather/today/l/CHXX0008:1:CH

[xgqfrms]

git merge

https://stackabuse.com/git-merge-branch-into-master/

https://stackoverflow.com/questions/5601931/what-is-the-best-and-safest-way-to-merge-a-git-branch-into-master

merge feature branch to origin/master branch

$ git checkout master
$ git pull origin master
$ git merge test
$ git push origin master

merge origin/master branch to feature branch

https://stackoverflow.com/questions/16955980/git-merge-master-into-feature-branch/58814036#58814036

# step1: change branch to master, and pull to update all commits
$ git checkout master
$ git pull

# step2: change branch to target, and pull to update commits
$ git checkout feature
$ git pull

# step3: merge master to feature(⚠️ current is feature branch)
$ git merge master

[xgqfrms]

[xgqfrms]

[xgqfrms]

auth bug