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
mohammad ghari