由于库合并还没有实现，有什么方法吗？ [英] Since Repository Merge is not implemented yet, is there any alternative?

问题描述

有一个在我们公司的一个项目，具有一个复杂的文件同步的情况，自然GIT想出了一个解决方案。由于这是一个.NET项目，libgit2sharp正是我们要找的API。

，因为它似乎从空指针的回应此主题，合并仍然没有实现，不能够从远程合并修改分公司可以使我们想起另一种方式来解决这个问题（我们不希望因为我们已经做了与libgit2sharp测试是真正的成功）。

是否有可能或替代提供远程合并？它会被释放在短期内？

在此先感谢。

解决方案

  

它会被释放在短期内？

合并必将实现。然而，有没有时间表呢。首先，这个 拉动申请 已经敲定的一部分该ligit2项目。也许一些额外的更高级别的API也将是必需的。然后，它会通过LibGit2Sharp予以提供。

  

是否有可能或替代提供远程合并？

你有没有考虑暂时炮击了以git.exe？

这是什么 GitHub上的Windows 和的 Git的-TFS 做的，比如

天色利用LibGit2Sharp，部分依靠git.exe的一切是尚未公布。

然后，一旦需要一个功能已被添加到LibGit2Sharp，取代调用git.exe通过调用LibGit2Sharp

只要你已经到位，一些光抽象层和一些单元测试，这不应该是一个太不平坦的道路。

更新

合并的特点是现在LibGit2Sharp（请参阅 拉要求＃608 ）

There's a project in our company that features a complex file sync scenario and naturally git came up as a solution. As it is a .net project, libgit2sharp was exactly the API we were looking for.

As it seems from nullpointer's response to this thread, merge is still not implemented and not being able to merge changes from a remote branch could lead us to think on another way to solve this (and we wouldn't like to since the tests we already did with libgit2sharp were really successful).

Is there a possibility or alternative to provide remote merging? Will it be released in the short term?

Thanks in advance.

解决方案

Will it be released in the short term?

Merge is bound to be implemented. However, there's no timeline yet. First, this Pull request has to be finalized as part of the ligit2 project. Maybe some additional higher level APIs will also be required. Then it will be made available through LibGit2Sharp.

Is there a possibility or alternative to provide remote merging?

Have you considered temporarily shelling out to "git.exe"?

This is what GitHub for Windows and Git-Tfs do, for instance.

Partly leveraging LibGit2Sharp, and partly relying on git.exe for everything which is not available yet.

Then, once a required feature has been added to LibGit2Sharp, replace the call to git.exe with a call to LibGit2Sharp.

Provided you've put in place some light abstraction layer and some unit tests, this shouldn't be a too bumpy road.

Update

Merge feature is now available in LibGit2Sharp (see pull request #608)

这篇关于由于库合并还没有实现，有什么方法吗？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！