与GIT和跨平台的MCC问题

嗨，我是新的论坛，我遇到一个问题与MCC版本控制（GIT）。我在论坛上搜索，没有发现类似的问题。因此，我发布了一个新的线程来描述这个问题。请告诉我，如果我做错了什么，或者它是一个假警报。后台有Windows PC和Mac笔记本电脑，并设置Git版本控制的一个消亡项目。Git ReavicRead远程是在Bit Bu桶上，GitigNORE是从Microchip论坛上的帖子粘贴复制的。我创建了一个Mac上传到RPO的项目，当我试图继续在Windows上的工作并对MCC配置、问题集做一些修改时，我把克隆到我的Windows PC.上。MCC输出表示：手动差异/合并需要，但实际上所有的行都在所有生成的文件中移动。详情请参阅附图。如果我在Mac上编辑MCC，我在Windows上创建和编辑，它可以，但不是跨平台。所以可以在QualoSythyHPC.ZIP附件中找到，不能发布Git链接。McCopy.MC3和GiTigNoRE在其中。我已经上传了IDE日志文件和一些截图。希望有人可以查看这个，看看问题是什么。谢谢。系统INFooDePosi:好奇HPCMIC:PIC18F24K40MCCONTURCT.MC3生成：OSX 102.6MPLAB IDV4.01MCC V3.36XC81.44并修改：Windows 7MPLAB IDV4.01MCC V3.36XC81.44，渭源
QualoSythyHPC.Zip（149.44 KB）-下载33次



      以下为原文

    Hi,

I am new to the forum and I come to a problem with MCC with version control (GIT). I searched the forum and found no similar problem raised. Therefore I post a new thread to describe the issue. Please let me know if I did anything wrong or it is a false alARM.

Background
I have windows PC and a MAC laptop and setting up GIT version control for a evluating project. GIT reposity remote is on Bitbucket and .gitignore is copy pasted from a post on microchip forum.  I created the project on MAC uploaded to repo and clone the repo onto my Windows PC. When i tried to continue my job on Windows and make some changes to MCC configuration, problem comes.

Problem
After I clicked generate button,  contents in mcc_generated_files are removed. MCC output says: Manual diff/merge required, but actually all lines are moved in all generated files. Please see attached pictures for details. It is fine if I edit MCC on MAC and I tried vice versa, create and edit on Windows, it is ok, but not cross platform.

So project can be found in attachment in Curiosity_HPC.zip, cannot post git links. McConfig.mc3 and .gitignore are in it. I've uploaded IDE log file and some screenshots as well.

Hopefully some one can look into this and see what the problem is. Thanks.


System Info
DevBoard: Curiosity HPC
Chip:         PIC18F24K40

McConfig.mc3 generated on:
OSX            10.12.6
MPLAB IDE  v4.01
MCC           v3.36
xc8             1.44

and modified on:
Windows 7
MPLAB IDE  v4.01
MCC            v3.36
xc8             1.44




Regards,

Weiyuan
   Attached Image(s)


Attachment(s)

MPLAB_IDE_Log.txt (228.27 KB) - downloaded 51 times
Curiosity_HPC.zip (149.44 KB) - downloaded 33 times