Tuesday 14 June 2016

Merging master branch from another sub branch in Github, Bitbucket

There are Two way for merge branch

First Way For Merge branch
  1. Open Terminal.
  2. Change the current working directory to your local project.
  3. Check out the branch you wish to merge to. Usually, you will merge into master
    • $ git checkout master
  4. 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
  5. If there are conflicts, resolve them. For more information, see "Resolving a merge conflict from the command line".
  6. Commit the merge.
  7. Review the changes and ensure they are satisfactory.
  8. 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