GIT GUIDE TO MERGE
From Github Repository
Create new branch from dev branch (Start pulling from dev branch)
OR create new branch and pull dev branch from new branch
Work on New branch and see changes on local or dev
Commit all the changes to new branch
Push to new branch
Go to GitHub
Click on compare & pull request
Set base to test
Add assignee
Click on Create Pull Request
After merge complete to dev apply steps from 5 to merge in master
You are done
From Git Bash
- Git bash from the project folder you want to merge
- Checkout to the respective branch to merge
git checkout <your branch>
- Merge the branch with new feature
git merge <branch to merge>
Comments
Post a Comment