Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.

第一步:先修改本地代码,改成自己认为正确的代码,然后commit

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._第1张图片

 

第二步:进行Stash changes

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._第2张图片

第三步:push代码,可以成功

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._第3张图片

第四步:成功pull代码

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._第4张图片

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._第5张图片

你可能感兴趣的:(java)