shionryuu/merging_via_command_line.md

Created January 24, 2021 03:01

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/shionryuu/88c321b6a59e710c7efddd36a801d716.js"></script>
Save shionryuu/88c321b6a59e710c7efddd36a801d716 to your computer and use it in GitHub Desktop.

Download ZIP

Merging via command line

Raw

merging_via_command_line.md

Merging via command line

If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.

Step 1: From your project repository, bring in the changes and test.

git fetch origin
git checkout -b branch-to-merge origin/branch-to-merge
git merge master

Step 2: Merge the changes and update on GitHub.

git checkout master
git merge --no-ff branch-to-merge
git push origin master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment