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

1 vote111 views1 answer
Linux ram drive
Shell/Bash
0 vote143 views1 answer
Yii3 install
Shell/Bash
0 vote122 views2 answers
How to install unsigned drivers on windows 10
Shell/Bash
0 vote116 views1 answer
Como actualizar node en ubuntu
Shell/Bash
1 vote115 views1 answer
Bitcoin miner for mac cli
Shell/Bash
0 vote121 views1 answer
Proxmox home assistant
Shell/Bash
2 votes105 views1 answer
A.isdigit(): for negatives
Shell/Bash
1 vote116 views2 answers
Rabbitmqctl
Shell/Bash
0 vote114 views1 answer
Adonis run specific seeder
Shell/Bash
1 vote129 views1 answer
Oracle number of cpus
Shell/Bash