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 vote110 views2 answers
Version control tools
Shell/Bash
1 vote137 views1 answer
How completely remove kde
Shell/Bash
0 vote99 views1 answer
How to avoid nginx not found 404 error ubuntu react app
Shell/Bash
0 vote92 views2 answers
How to configure bluetooth on ubuntu command line
Shell/Bash
-1 vote114 views2 answers
Change file name in terminal
Shell/Bash
0 vote109 views1 answer
How delete all wine files in linux
Shell/Bash
0 vote127 views1 answer
To check the Logs in Ubuntu and Debian
Shell/Bash
1 vote118 views1 answer
Rasbery pie heruntrerfahren mit command
Shell/Bash
1 vote109 views1 answer
Remove space at end of line file
Shell/Bash
0 vote105 views1 answer
How to install terraform macos
Shell/Bash