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 vote66 views3 answers
Temp mail api github
Shell/Bash
0 vote110 views1 answer
Bash run last command as sudo
Shell/Bash
0 vote128 views1 answer
View lubuntu-desktop from another computer
Shell/Bash
0 vote105 views1 answer
Install .net sdk on ubuntu
Shell/Bash
0 vote116 views1 answer
Install firefox redhat 7
Shell/Bash
0 vote217 views1 answer
How to sync my directory with my deleted file change
Shell/Bash
0 vote113 views1 answer
Upload transfer.sh
Shell/Bash
0 vote107 views1 answer
Use ampersand in query string
Shell/Bash
16 votes106 views3 answers
Open source code
Shell/Bash
0 vote124 views1 answer
Microsoft todo for linux
Shell/Bash