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 vote328 views1 answer
SHOULD AVOID - SECURITY RISK
Shell/Bash
0 vote244 views1 answer
Install blender tar.xz
Shell/Bash
1 vote282 views1 answer
Ubuntu iptables open ssh output port
Shell/Bash
0 vote279 views1 answer
Bin/magento command not found
Shell/Bash
0 vote336 views1 answer
Mac alias
Shell/Bash
2 votes317 views1 answer
Cmd check if file exists or not
Shell/Bash
0 vote326 views1 answer
Install networkx python
Shell/Bash
0 vote272 views1 answer
Sync folder from local to server with progress
Shell/Bash
0 vote295 views1 answer
Use xargs multiple times
Shell/Bash
0 vote310 views1 answer
Tns-platform-declarations/android/android.d.ts' not found
Shell/Bash