Branching and merging Biztalk orchestrations and maps

Question

如果在两个分支中（例如在tfs或git中）对Biztalk业务流程（.odx）或映射（.btm）进行更改，是否存在将更改从一个分支合并到另一个分支的强大且定义明确的方法？

Answer 1

Unfortunately, there's no good way to really merge or diff ODX and BTM files. BTM files in particular get rough because they tend to be stored on a single line. ODX files contain plenty of GUIDs that change, as well as designer information that's difficult to merge. This generally means that if there are differences I end up taking server or keeping local and working with the other developer to make changes.

Your best strategy is probably to put code that will change into a helper library and to call it from expression shapes and/or ExternalAssembly scripting functoids. Source control will work well for branching/merging changes to a .NET library.

Obviously this won't be able to capture all differences. You should also try to modularize Orchestrations when possible (use call/start orchestration, partner correlation, etc.) so that the individual artifacts are small and won't require (as?) many concurrent changes.

One other possibility for maps is to have them refer to external XSLT that is source controlled - but then you lose the value of the mapper designer.