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

17 votes129 views5 answers
Remove directory from git
Shell/Bash
1 vote128 views2 answers
Install amazon-linux-extras
Shell/Bash
0 vote146 views1 answer
Xampp shell fonts
Shell/Bash
0 vote124 views1 answer
D3 install
Shell/Bash
4 votes135 views2 answers
Change size of image in github readme
Shell/Bash
1 vote124 views1 answer
Xclip does not work
Shell/Bash
0 vote131 views1 answer
How to install things with apt
Shell/Bash
1 vote114 views1 answer
Ssh operation timed out mac
Shell/Bash
0 vote115 views1 answer
Ipnyb to ppt
Shell/Bash
1 vote123 views1 answer
Find number of occurances of a string in a file shell
Shell/Bash