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

3 votes219 views1 answer
Find how many lines in a file linux
Shell/Bash
23 votes182 views1 answer
Check memory type
Shell/Bash
1 vote168 views1 answer
Install twilio
Shell/Bash
0 vote176 views2 answers
Install scoop
Shell/Bash
0 vote183 views1 answer
Copy a Local File to a Remote System with the scp Command
Shell/Bash
6 votes189 views1 answer
Sh declare variable
Shell/Bash
0 vote171 views1 answer
How to add program to command line linux
Shell/Bash
0 vote162 views1 answer
Como desfazer um git add .
Shell/Bash
0 vote183 views1 answer
Grep simon
Shell/Bash
0 vote179 views1 answer
Nx test angular app
Shell/Bash