-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Diff 处理
Siqi Zhao edited this page Mar 2, 2024
·
1 revision
Diff 处理即对配置文件进行三路合并,允许在不使用配置文件预处理的情况下,保留对配置文件的修改并应用到下次更新。
0.18.4 版本更新后,支持使用 Diff 方式处理配置文件。
如果你熟悉 Git,此方式类似于git merge
。
- 进入 Profiles 界面,在需要设置 Diff 处理的配置文件右侧三点图标悬停,出现菜单后,点击构建 Diff 文件图标:
![diff1 8e879692](https://private-user-images.githubusercontent.com/77391690/309469357-fe1b291a-bba1-4309-95ab-c88be1b8354f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTkzMzkzNzksIm5iZiI6MTcxOTMzOTA3OSwicGF0aCI6Ii83NzM5MTY5MC8zMDk0NjkzNTctZmUxYjI5MWEtYmJhMS00MzA5LTk1YWItYzg4YmUxYjgzNTRmLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MjUlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjI1VDE4MTExOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWM5ZTZjMDdkZjMxODIwZmM4ZTEyY2MzNTBhODhhMjE0N2E4NTUwZGM4YTU4OGQ4MDgyZjU2Yjk1YmJkOTk5MWUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.i9_esHM3wF4c9vAFDctYL2lgMp_Um3_469yP8alCY80)
![diff2 cf612d69](https://private-user-images.githubusercontent.com/77391690/309469364-a5e03c30-635c-474f-ad24-529c0bcd3233.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTkzMzkzNzksIm5iZiI6MTcxOTMzOTA3OSwicGF0aCI6Ii83NzM5MTY5MC8zMDk0NjkzNjQtYTVlMDNjMzAtNjM1Yy00NzRmLWFkMjQtNTI5YzBiY2QzMjMzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MjUlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjI1VDE4MTExOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTVlYzExZGVhYzM2ZTA3MDgyMmZiMjk0NWM5Zjg0NjBjNTlhMWVlN2I4OGEyOTZlNTFlNDIwMDIwYzA3NGIwNGYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.RVnGRiq7AFAJnEFiyqGyQzksAQE2iNsNmeTHrW1-uKQ)
-
此时会调用系统默认编辑器编辑配置文件,对此文件的编辑将会在配置文件更新时自动合并到新的配置文件中
-
更新一次配置文件
如果远端配置文件发生更新,并且与本地修改产生冲突,将需要手动进行合并。
冲突的格式非常简单:
<<<<<<<
本地修改
=======
远端修改
>>>>>>>
根据自己的需求,把多余的地方删除即可,包括<<<<<<<
、=======
和>>>>>>>
。
如果使用 VSCode,操作更简便:
![diff3 e0affcae](https://private-user-images.githubusercontent.com/77391690/309469449-bea51a7d-954f-4728-92a4-dadcb4f0a5b6.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTkzMzkzNzksIm5iZiI6MTcxOTMzOTA3OSwicGF0aCI6Ii83NzM5MTY5MC8zMDk0Njk0NDktYmVhNTFhN2QtOTU0Zi00NzI4LTkyYTQtZGFkY2I0ZjBhNWI2LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MjUlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjI1VDE4MTExOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTY1M2NhNzVjYmNjYWFkMWY5ODI2MjU2YzIyMjdkZDYyNzBmMGJiNWIzNTZiZTlmY2Q1Y2MwMDUzOGE1OWIxMWQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.2RAgehXfjt4o95VDaUAmcWd8EdX9_tS3iP7vgy2tHV8)
TIP
Diff 处理会在预处理之后进行