eclipse下git代码冲突解决办法

add to index

commit and push

发现冲突

pull

解决冲突,代码取舍

add to index

commit and push

ok

git
git