合并2个文件以进行更新 [英] merge 2 files for updation

问题描述

我正在创建Windows应用程序.我的朋友也在帮助我.他已经完成了部分编码和设计工作.两者都使用相同的表格，但是在不同的计算机上.没有局域网连接.我们有便携式驱动器来共享项目.我们现在在应用程序中有3种形式.我们俩都使用这3种形式.现在我们需要共享应用程序以更新更改.因此，请帮助我们合并文件，同时更新新代码并保留旧代码.

i am creating a windows application. my friend is also helping me. he has done some coding and design from his part. both use same forms but in different computers. No lan connectivity. we have portable drives to share the project.we have 3 forms in the application now. all 3 forms are used by both of us. now we need to share the application to update the changes. so help us to merge the files with updating the new codes and retaining the old codes. the changes made in both the codes are to be updated in 1 form.

推荐答案

有一些可用的工具，例如 WinMerge [ ^ ]合并两个文件.也许这些可能有用

There are some tools available for e.g. WinMerge[^] to merge two files. Maybe those can be useful

这篇关于合并2个文件以进行更新的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！