There are Two way for merge branch
First Way For Merge branch
Second Way For Merge branch
First Way For Merge branch
- Open Terminal.
- Change the current working directory to your local project.
- Check out the branch you wish to merge to. Usually, you will merge into master
- $ git checkout master
- Pull the desired branch from the upstream repository. This method will retain the commit history without modification.
- $ git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
- If there are conflicts, resolve them. For more information, see "Resolving a merge conflict from the command line".
- Commit the merge.
- Review the changes and ensure they are satisfactory.
- Push the merge to your GitHub repository.
- $ git push origin master
Second Way For Merge branch
$ git checkout master
$ git pull origin master
$ git merge test
$ git push origin master
No comments:
Post a Comment