douyuan4357
douyuan4357
2019-01-11 05:59

当发生合并冲突时,git避免使用FTP上传文件

已采纳

first, Sorry for my weak english

i have a local repository and a repository on my server which remote to online repository on VSTS.

.-local\
        .VSTS
.server/

I run pull command in ServerRepo and conflict occured. some files both modified. so i have tried to edit conflicted file with phpStorm and upload them with FTP. but upload files Failed! so i edit non conflicted file and sent it to server with FTP without any issues.

finally i found that just conflicted files cannot be uploaded.

What should I do?

  • 点赞
  • 写回答
  • 关注问题
  • 收藏
  • 复制链接分享
  • 邀请回答

1条回答

  • doutui7955 doutui7955 2年前

    finally i know the reason of this issue.

    i use git in server with root user and conflicted file's owner changed to root from admin.

    for this reason i recieved error. i change files owner and issue Solved,

    点赞 评论 复制链接分享

相关推荐