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 vote350 views1 answer
Grep only third match
Shell/Bash
0 vote331 views1 answer
Find rm files older than 30 days
Shell/Bash
0 vote316 views1 answer
Node_modules missing did you mean to install
Shell/Bash
0 vote338 views1 answer
Exclude host in ansible adhoc command
Shell/Bash
0 vote305 views1 answer
Iterm open full screen
Shell/Bash
0 vote361 views1 answer
Setup source.list of ROS
Shell/Bash
0 vote374 views1 answer
Install goaccess
Shell/Bash
0 vote322 views1 answer
Ps install Connect-ExchangeOnlineShell
Shell/Bash
0 vote309 views2 answers
Como agreagar archivo a .gitignore y eliminarlo del repositorio
Shell/Bash
7 votes343 views3 answers
Linux vim set tab to 4 spaces
Shell/Bash