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 vote147 views1 answer
Kubeadm get discovery-token-ca-cert-hash command openssl
Shell/Bash
12 votes163 views2 answers
How to remove node modules from github
Shell/Bash
2 votes150 views2 answers
Code . not working mac
Shell/Bash
0 vote173 views1 answer
Install composer wsl
Shell/Bash
0 vote177 views1 answer
Why is my db.sqlite3 is not gitignore
Shell/Bash
-2 votes177 views1 answer
I dont have pip, hoow to install pandas
Shell/Bash
20 votes152 views4 answers
Heroku cli login
Shell/Bash
0 vote149 views1 answer
Extraire 1 image toute le 10 secondes
Shell/Bash
5 votes151 views6 answers
How to install webpack
Shell/Bash
17 votes146 views3 answers
Update flutter
Shell/Bash