Git 3 way merge

Start a new featuregit checkout -b new-feature master
# Edit some filesgit 
add <file>git commit -m "Start a feature"
# Edit some filesgit 
add <file>git commit -m "Finish a feature"
# Develop the master branch
git checkout master
# Edit some files
git add <file>git commit -m "Make some super-stable changes to master"
# Merge in the new-feature branch
git merge new-featuregit branch -d new-feature

Source: atlassian.com

Similar codes

2 votes334 views1 answer
Delete all files with specific name ubuntu
Shell/Bash
1 vote352 views1 answer
- laravel/installer is locked to version v3.2.0 and an update of this package was not requested.
Shell/Bash
14 votes345 views1 answer
Nvm how to install specific version of node
Shell/Bash
2 votes320 views1 answer
How to get stashed on git
Shell/Bash
0 vote284 views1 answer
Join 2 files linux
Shell/Bash
7 votes366 views2 answers
Download torrent on ubuntu
Shell/Bash
0 vote315 views1 answer
Install pcl ubuntu
Shell/Bash
2 votes320 views2 answers
Mac install gpg
Shell/Bash
0 vote336 views1 answer
Give root permission to program linux
Shell/Bash
0 vote341 views1 answer
Fuser command in ubuntu
Shell/Bash