1、 将feature合并到master
git checkout feature1
git add .
git commit -m "feature1"
git checkout master
git merge feature1
/*
如果有冲突解决冲突
git add .
git commit
*/
git push master -f
1、 将feature合并到master
git checkout feature1
git add .
git commit -m "feature1"
git checkout master
git merge feature1
/*
如果有冲突解决冲突
git add .
git commit
*/
git push master -f