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 vote165 views1 answer
Php mysqldump terminal
Shell/Bash
-1 vote238 views4 answers
How to set up password ssh access askubuntu
Shell/Bash
0 vote165 views1 answer
How to install onlyoffice on linux
Shell/Bash
1 vote168 views1 answer
Linux test examples
Shell/Bash
0 vote160 views1 answer
How to erase folder that match characters in linux
Shell/Bash
-1 vote165 views2 answers
Install composer in dockerfile
Shell/Bash
18 votes206 views6 answers
How to install django on windows
Shell/Bash
0 vote167 views1 answer
Terminal find containing directory of file and cd to directory
Shell/Bash
0 vote179 views1 answer
How to enable separate windows on taskbar in ubuntu
Shell/Bash
13 votes174 views2 answers
Linux see remaining disk space
Shell/Bash