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 vote142 views1 answer
Aws linux install git
Shell/Bash
0 vote180 views1 answer
Centos zip folder
Shell/Bash
1 vote201 views1 answer
Vs code always says rebasing git
Shell/Bash
0 vote267 views3 answers
Gunicorn
Shell/Bash
44 votes193 views5 answers
Ps1 cannot be loaded because running scripts is disabled on this system. For more information, see about_Execution_Policies at
Shell/Bash
3 votes198 views2 answers
Vuetify install
Shell/Bash
2 votes169 views1 answer
How can i rename my local master branch to main ?
Shell/Bash
0 vote225 views1 answer
Install homebrew package manager for ubuntu and depian based systems
Shell/Bash
0 vote174 views1 answer
Run rpush
Shell/Bash
3 votes196 views3 answers
Debloat windows 10
Shell/Bash