douyuan4357 2019-01-11 05:59
浏览 240
已采纳

当发生合并冲突时,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 2019-01-11 06:32
    关注

    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,

    本回答被题主选为最佳回答 , 对您是否有帮助呢?
    评论

报告相同问题?

悬赏问题

  • ¥15 求一下解题思路,完全不懂
  • ¥15 tensorflow
  • ¥15 densenet网络结构中,特征以cat方式复用后是怎么进行误差回传的
  • ¥15 STM32G471芯片spi设置了8位,总是发送16位
  • ¥15 R语言并行计算beta-NTI中tree文件的类型
  • ¥15 如何解读marsbar导出的ROI数据?
  • ¥20 求友友协助弄一下基于STC89C52单片机的声光控制灯原理图
  • ¥15 arduino双向交通灯设计
  • ¥15 有没有会粒子群算法的大能(○゜ε^○)求带不会出收敛图😭
  • ¥15 Matlab读取根元素出错