Breaking News: Grepper is joining You.com. Read the official announcement!

git 3 way merge

mohammad ghari answered on February 10, 2021 Popularity 9/10 Helpfulness 2/10

answer git 3 way merge

git 3 way merge

Comment

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

Popularity 9/10 Helpfulness 2/10 Language shell

Source: www.atlassian.com

Tags: 3-way-merge git shell

Link to this answer
Share Copy Link