提交代码到Bitbucket git add ./ git commit -m “conflict fix” git push origin master 转载于:https://www.cnblogs.com/ielse/p/11436576.html