git merge to master code example

Example 1: git create new branch

// create and checkout new branch in one line
git checkout -b new_branch

Example 2: how to merge git branch to master

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

Example 3: merging branches in git

//Make sure you are in your branch. Develop is a a branch in this case

git checkout master
Switched to branch 'master'

git pull
To pull changes of team members to your master

git checkout develop
git merge master
Resolve Conflicts in develop

git checkout master
git merge develop
To merge your final changes along with other changes to your master

git pull
If there were any additional changes made meanwhile

git push
To push the final master to the master repository

git checkout develop
//Move to branch again to work

Example 4: git merge branch

//this is for merging into a local branch//

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name

Example 5: git merge branch to master

$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html |    1 +
1 file changed, 1 insertion(+)

Example 6: git merge to master

How to merge a branch?

#1 branchName  - development
- push all the changes in your current branch 
	- until it shows ( Everything up-to-date )
    
#2 branchName - production
- goto your new branch where you wana merge the changes
	- git checkout your_branch_name
    - git merge development 		( #1 branchName )
    
# DONE ✅