git 合并解决冲突

git checkout -b bob.yuan/ixIos-dev FETCH_HEAD


git checkout dev


git merge --no-ff bob.yuan/ixIos-dev


git push orgin dev


git branch


git remote -v


git remote add ixIos http://dev.ixdigit.com/app/ixIos.git


git remote -v


git fetch ixIos dev:test


git branch


 git merge test


 git status


git add .


git commit -am"merge2"


stash    commit   


git pull origin dev