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 vote331 views2 answers
Wget as file name
Shell/Bash
0 vote364 views1 answer
Pocketsphinx mac big sur
Shell/Bash
0 vote398 views1 answer
Setup source.list of ROS
Shell/Bash
1 vote327 views1 answer
How to find jvm path in linux
Shell/Bash
0 vote375 views1 answer
Snap-update-ns failed with code 1
Shell/Bash
0 vote367 views1 answer
* daemon not running; starting now at tcp:5037
Shell/Bash
3 votes351 views1 answer
Wget command not found mac
Shell/Bash
1 vote382 views1 answer
Git push error
Shell/Bash
1 vote353 views1 answer
Ngxcountup
Shell/Bash
0 vote380 views1 answer
Generate patch file git
Shell/Bash