一:创建分支
private static void BranchFile(Workspace workspace, String newFilename) { String branchedFilename = Path.Combine(Path.GetDirectoryName(newFilename), Path.GetFileNameWithoutExtension(newFilename)) + "-branch" + Path.GetExtension(newFilename); workspace.PendBranch(newFilename, branchedFilename, VersionSpec.Latest, LockLevel.Checkin, true); var pendingChanges = workspace.GetPendingChanges(); int changesetForBranch = workspace.CheckIn(pendingChanges, "Branched file"); }
二:合并分支
private void Merge(Workspace workspace,string source,string target) { GetStatus status = workspace.Merge(source, target, null, null, LockLevel.None, RecursionType.Full, MergeOptions.None); status.NumConflicts.ToString();//冲突数量 status.NumFailures.ToString(); //失败数量 status.NumOperations.ToString();//服务器端的操作数量 status.NumWarnings.ToString(); //警告数量 }
【推荐】编程新体验,更懂你的AI,立即体验豆包MarsCode编程助手
【推荐】凌霞软件回馈社区,博客园 & 1Panel & Halo 联合会员上线
【推荐】抖音旗下AI助手豆包,你的智能百科全书,全免费不限次数
【推荐】博客园社区专享云产品让利特惠,阿里云新客6.5折上折
【推荐】轻量又高性能的 SSH 工具 IShell:AI 加持,快人一步