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

0 vote289 views1 answer
Unsupported upgrade request.
Shell/Bash
0 vote169 views1 answer
Evernote linux
Shell/Bash
0 vote137 views1 answer
Manjaro linux system information
Shell/Bash
1 vote144 views1 answer
Target lcobucci jwt parser is not instantiable while building laravel passport
Shell/Bash
1 vote143 views1 answer
React-scroll
Shell/Bash
1 vote155 views3 answers
Restart nginx in mac
Shell/Bash
0 vote145 views1 answer
Fast downloader command line
Shell/Bash
8 votes173 views2 answers
Create new repository on the command line
Shell/Bash
11 votes151 views4 answers
How to pull a new remote branch
Shell/Bash
0 vote148 views1 answer
Git change commit id email
Shell/Bash