@ibgib/vcs-gib 0.0.17 → 0.0.20

package/dist/engine/merge/b2tfs-3way-merge-strategy.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"b2tfs-3way-merge-strategy.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-merge-strategy.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,eAAe,EAAE,IAAI,EAAU,MAAM,iDAAiD,CAAC;AAEhG,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,uDAAuD,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,MAAM,2CAA2C,CAAC;AAGjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAKlH,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,qDAAqD,CAAC;AACzI,OAAO,EAAE,QAAQ,EAAE,mCAAmC,EAAmE,MAAM,oDAAoD,CAAC;AAGpL,OAAO,EAAE,eAAe,EAAE,MAAM,6DAA6D,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAqB,2BAA2B,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACtH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKjF,MAAM,MAAM,GAAG,6BAA6B,CAAC;AAC7C,MAAM,OAAO,GAAG,gBAAgB,IAAI,IAAI,CAAC;AACzC,MAAM,SAAS,GAAG,oBAAoB,CAAC;AAUvC;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,EACrC,OAAO,EACP,QAAQ,EACR,UAAU,GAKb;IACG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACtE,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC1B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACvB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAGD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE/D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,cAAc,GAAG,CAAC,CAAC;IAEvB,OAAO,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,YAAY,GAAG,UAAU,CAAC,MAAM,IAAI,cAAc,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;QAC1G,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,eAAe,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QAErD,MAAM,SAAS,GAAG,aAAa,IAAI,aAAa,CAAC,KAAK,KAAK,MAAM,CAAC;QAClE,MAAM,WAAW,GAAG,eAAe,IAAI,eAAe,CAAC,KAAK,KAAK,MAAM,CAAC;QAExE,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC;YACtC,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC;YACxC,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC9C,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;YAEhD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACjE,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACJ,WAAW,GAAG,IAAI,CAAC;gBACnB,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC5B,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5B,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC5B,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YAClD,MAAM,IAAI,WAAW,CAAC;YACtB,YAAY,EAAE,CAAC;YACf,cAAc,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACnB,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC/D,MAAM,IAAI,WAAW,CAAC;YACtB,YAAY,EAAE,CAAC;QACnB,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACrB,WAAW,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,WAAW,CAAC;YACtB,cAAc,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACJ,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAC3B,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnC,MAAM,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACJ,IAAI,aAAa,IAAI,YAAY,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;oBACpD,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC5C,YAAY,EAAE,CAAC;gBACnB,CAAC;gBACD,IAAI,eAAe,IAAI,cAAc,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;oBAC1D,WAAW,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;oBAC9C,cAAc,EAAE,CAAC;gBACrB,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO;QACH,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;QAClC,WAAW;KACd,CAAC;AACN,CAAC;AAED,MAAM,OAAO,sBAAuB,SAAQ,yBAAyB;IACxD,UAAU,GAAW,wBAAwB,CAAC;IAC/C,EAAE,GAAG,0BAA0B,CAAC;IAExC;;;;;;;;;;OAUG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAqB;QAChC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;QAC/C,IAAI,CAAC;YACD,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;YAE5F,iGAAiG;YACjG,MAAM,mBAAmB,GAAG,gBAAgB,KAAK,oBAAoB,CAAC,iBAAiB,IAAK,gBAA2B,KAAK,gBAAgB,CAAC;YAC7I,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvB,mEAAmE;gBACnE,sSAAsS;gBACtS,OAAO,KAAK,CAAC,CAAC,wBAAwB;YAC1C,CAAC;YAED,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACzB,IAAI,OAAO,EAAE,CAAC;oBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,mGAAmG,CAAC,CAAC;gBAAC,CAAC;gBACvI,OAAO,KAAK,CAAC,CAAC,wBAAwB;YAC1C,CAAC;YAED,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,mCAAmC,CAAC;gBAC3D,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;gBAC3B,eAAe,EAAE,cAAc;gBAC/B,KAAK;aACR,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,+IAA+I,CAAC,CAAC;YAAC,CAAC;YAChL,IAAI,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,gJAAgJ,CAAC,CAAC;YAAC,CAAC;YAEjL,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAE/E,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBACzB,sKAAsK;gBACtK,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;oBACnD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,SAAS,iHAAiH,CAAC,CAAA;gBACrJ,CAAC;gBACD,OAAO,KAAK,CAAC,CAAC,wBAAwB;YAC1C,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,IAAI,CAAC,MAAM,2BAA2B,IAAI,CAAC,IAAI,CAAC,MAAM,2FAA2F,CAAC,CAAC;YAAC,CAAC;YAEzP,0DAA0D;YAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,CAAC;YACnD,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,OAAO,KAAK,CAAC,CAAC,wBAAwB;YAAC,CAAC;YAEvD,+DAA+D;YAC/D,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACvF,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAqB;QAC7B,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;QAC/D,IAAI,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,+EAA+E,CAAC,CAAC;YACtG,CAAC;YAED,MAAM,EACF,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,KAAK,EACL,eAAe,GAClB,GAAG,OAAO,CAAC;YAGZ,gFAAgF;YAChF,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;YACrE,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC7D,MAAM,uBAAuB,GAAG,MAAM,mCAAmC,CAAC;gBACtE,eAAe,EAAE,cAAc;gBAC/B,KAAK,EAAE,eAAe;gBACtB,KAAK;aACR,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,uBAAuB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAEpD,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;YACrE,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC7D,MAAM,yBAAyB,GAAG,MAAM,mCAAmC,CAAC;gBACxE,eAAe,EAAE,cAAc;gBAC/B,KAAK,EAAE,eAAe;gBACtB,KAAK;aACR,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAExD,kFAAkF;YAClF,MAAM,EACF,OAAO,EACP,UAAU,EACV,SAAS,EACT,YAAY,GACf,GAAG,IAAI,CAAC,oBAAoB,CAAC;gBAC1B,eAAe;gBACf,WAAW;gBACX,uBAAuB;gBACvB,aAAa;gBACb,yBAAyB;aAC5B,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACrD,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACxE,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACzD,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5E,IAAI,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,sBAAsB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YAAC,CAAC;YAC7H,IAAI,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,wBAAwB,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YAAC,CAAC;YAEjI,mDAAmD;YACnD,MAAM,CAAC,sBAAsB,CAAC,GAAG,MAAM,mCAAmC,CAAC;gBACvE,KAAK,EAAE,CAAC,qBAAqB,CAAC;gBAC9B,KAAK;aACR,CAAC,CAAC;YAEH,kFAAkF;YAClF,EAAE;YACF,kEAAkE;YAClE,sDAAsD;YACtD,gEAAgE;YAChE,gEAAgE;YAChE,oEAAoE;YACpE,eAAe;YACf,EAAE;YACF,uDAAuD;YACvD,mEAAmE;YACnE,gEAAgE;YAChE,mDAAmD;YACnD,EAAE;YACF,8BAA8B;YAC9B,iEAAiE;YACjE,8DAA8D;YAC9D,gEAAgE;YAChE,4CAA4C;YAC5C,kDAAkD;YAClD,yBAAyB;YACzB,2DAA2D;YAC3D,+DAA+D;YAC/D,mEAAmE;YACnE,iCAAiC;YACjC,uBAAuB;YACvB,kFAAkF;YAClF,kEAAkE;YAClE,kDAAkD;YAClD,+DAA+D;YAC/D,iEAAiE;YACjE,gEAAgE;YAChE,6DAA6D;YAC7D,gEAAgE;YAChE,oEAAoE;YACpE,eAAe;YACf,iEAAiE;YACjE,+DAA+D;YAC/D,8DAA8D;YAC9D,mEAAmE;YACnE,iEAAiE;YAEjE,yGAAyG;YACzG,2CAA2C;YAC3C,4CAA4C;YAC5C,oIAAoI;YACpI,oEAAoE;YACpE,mEAAmE;YACnE,kBAAkB;YAClB,4EAA4E;YAC5E,0MAA0M;YAC1M,QAAQ;YACR,oDAAoD;YACpD,6CAA6C;YAC7C,4CAA4C;YAC5C,kDAAkD;YAClD,UAAU;YACV,+EAA+E;YAC/E,mEAAmE;YACnE,IAAI;YAEJ,uEAAuE;YACvE,8BAA8B;YAC9B,uCAAuC;YACvC,aAAa;YACb,MAAM;YAEN,kKAAkK;YAElK,gDAAgD;YAChD,+DAA+D;YAC/D,4CAA4C;YAE5C,gDAAgD;YAChD,oBAAoB;YACpB,gFAAgF;YAChF,wCAAwC;YACxC,6BAA6B;YAC7B,MAAM;YAEN,0CAA0C;YAC1C,kEAAkE;YAClE,iHAAiH;YACjH,sFAAsF;YACtF,+GAA+G;YAC/G,2DAA2D;YAC3D,8GAA8G;YAC9G,qEAAqE;YACrE,8DAA8D;YAC9D,YAAY;YACZ,QAAQ;YACR,IAAI;YAEJ,8EAA8E;YAC9E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;YAC/G,IAAI,CAAC,OAAO,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YAAC,CAAC;YACvG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,OAAO,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YAAC,CAAC;YACvG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;YACjH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;YAAC,CAAC;YACzG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;YACrH,IAAI,CAAC,UAAU,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;YAAC,CAAC;YAE7G,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,kGAAkG,CAAC,CAAC;YAAC,CAAC;YAC1K,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,oGAAoG,CAAC,CAAC;YAAC,CAAC;YAC9K,8BAA8B;YAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACnC,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,mKAAmK,CAAC,CAAC;YACzL,CAAC;YAED,IAAI,MAAM,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,wDAAwD,CAAC,CAAC;YAAC,CAAC;YAG3I,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC;gBAC/C,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc;aAC5D,CAAC,CAAC;YACH,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,OAAO,EAAE,CAAC;oBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,8DAA8D,CAAC,CAAC;gBAAC,CAAC;YAClH,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC;gBAChD,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc;aAC7D,CAAC,CAAC;YACH,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,OAAO,EAAE,CAAC;oBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,+DAA+D,CAAC,CAAC;gBAAC,CAAC;YACnH,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC;gBAClD,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc;aAC/D,CAAC,CAAC;YACH,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAC9B,IAAI,OAAO,EAAE,CAAC;oBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,iEAAiE,CAAC,CAAC;gBAAC,CAAC;YACrH,CAAC;YAED,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3E,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACjF,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAExE,IAAI,SAAS,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;gBACvC,IAAI,OAAO,EAAE,CAAC;oBACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,mCAAmC,QAAQ,CAAC,IAAI,EAAE,IAAI,oEAAoE,CAAC,CAAC;gBACjJ,CAAC;gBAED,8DAA8D;gBAC9D,8DAA8D;gBAC9D,+DAA+D;gBAC/D,4DAA4D;gBAC5D,6DAA6D;gBAE7D,OAAO,SAAS,CAAC,CAAC,wBAAwB;YAC9C,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,yJAAyJ,CAAC,CAAC;YAAC,CAAC;YAChM,IAAI,CAAC,WAAW,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,0JAA0J,CAAC,CAAC;YAAC,CAAC;YAClM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,4JAA4J,CAAC,CAAC;YAAC,CAAC;YAEtM,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5D,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9D,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAElE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,UAAU,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,cAAc,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,eAAe,QAAQ,EAAE,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,iBAAiB,UAAU,EAAE,CAAC,CAAC;YAE5D,MAAM,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YACnF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,SAAS,iBAAiB,UAAU,EAAE,CAAC,CAAC;YAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;YAE/C,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACpD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,2BAA2B,QAAQ,CAAC,IAAI,CAAC,OAAO,kCAAkC,UAAU,CAAC,IAAI,CAAC,OAAO,yFAAyF,CAAC,CAAC;YAC1N,CAAC;YAED,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YACtC,MAAM,KAAK,GAAG,QAAQ,CAAC;gBACnB,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,MAAM;aACtB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAgB;gBAC1B,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,UAAU;aACnB,CAAC;YACF,QAAQ,CAAC,GAAG,GAAG,MAAM,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAEhE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAElD,iEAAiE;YACjE,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAGnD,MAAM,MAAM,GAAwC,CAAC,IAAuB,EAAE,EAAE;gBAC5E,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAE,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;gBACpG,CAAC;YACL,CAAC,CAAA;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;YAC3C,MAAM,WAAW,GAAG,aAAa,IAAI,eAAe,CAAC,CAAC;gBAClD,aAAa,CAAC,CAAC;gBACf,eAAe,CAAC;YAEpB,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC;gBACzC,YAAY,EAAE,QAAQ;gBACtB,YAAY,EAAE;oBACV,QAAQ;oBACR,CAAC,EAAE,WAAW,GAAG,CAAC;iBACrB;gBACD,cAAc,EAAE;oBACZ,CAAC,iBAAiB,CAAC,EAAE,CAAC,OAAO,CAAC;iBACjC;aACJ,CAAC,CAAC;YAEH,gBAAgB;YAChB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,gIAAgI,CAAC,CAAC;YAAC,CAAC;YAC3K,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,+HAA+H,CAAC,CAAC;YAAC,CAAC;YAC9K,MAAM,wBAAwB,GAAG,SAAS,CAAC,QAA6B,CAAC;YACzE,MAAM,WAAW,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAC;YACtE,IAAI,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAiB,WAAW,wCAAwC,CAAC,CAAC;YAAC,CAAC;YAExG,MAAM,iBAAiB,GAAe,EAAE,CAAC;YACzC,MAAM,oCAAoC,GAAe,EAAE,CAAC;YAE5D,iBAAiB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,SAAS,CAAC,kBAAkB,EAAE,CAAC;gBAC/B,0QAA0Q;gBAC1Q,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,oCAAoC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,CAAC;YAED,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACjE,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAE7D,MAAM,YAAY,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACvD,MAAM,cAAc,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAC;YACzE,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEjF;;;;;eAKG;YACH,MAAM,qBAAqB,GAA8B;gBACrD,qBAAqB,EAAE,WAAW;gBAClC,eAAe,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;gBACjG,uBAAuB,EAAE,aAAa;gBACtC,iBAAiB,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;aAC1G,CAAA;YAED,4BAA4B;YAC5B,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;gBACpC,gBAAgB;gBAChB,OAAO,EAAE,8DAA8D;gBACvE,gBAAgB,EAAE,CAAC,qBAAqB,CAAC;gBACzC,qBAAqB;gBACrB,iBAAiB,EAAE,eAAe;gBAClC,mBAAmB,EAAE,iBAAiB;gBACtC,eAAe,EAAE,EAAE;aACtB,CAAC,CAAC;YAEH,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9C,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACpD,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAEzD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC;gBAChC,GAAG,EAAE,wBAAwB;gBAC7B,iBAAiB,EAAE;oBACf,CAAC,qBAAqB,CAAC,EAAE,CAAC,aAAa,CAAC;iBAC3C;gBACD,GAAG,EAAE,IAAI;gBACT,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;YAAC,CAAC;YACnI,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC;YAChD,MAAM,iBAAiB,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YACjE,IAAI,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,uBAAuB,iBAAiB,wCAAwC,CAAC,CAAC;YAAC,CAAC;YAEpH,oCAAoC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAEpE,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC;gBACtC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;YACxE,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAExD,OAAO;gBACH,YAAY,EAAE,EAAE;gBAChB,kBAAkB,EAAE,iBAAiB;gBACrC,gCAAgC,EAAE,oCAAoC;gBACtE,sBAAsB,EAAE,CAAC,QAAQ,CAAC;gBAClC,WAAW,EAAE,aAAa;gBAC1B,gBAAgB,EAAE,SAAS;aAC9B,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACvF,MAAM,KAAK,CAAC;QAChB,CAAC;gBAAS,CAAC;YACP,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;YACzE,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,eAAe,GAKlB;QACG,IAAI,CAAC,IAAI,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACjE,IAAI,eAAe,EAAE,CAAC;YAClB,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;gBAAC,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;YACtE,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;YAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;YACnK,IAAI,WAAW,EAAE,CAAC;gBAAC,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;YAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACpE,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5D,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/C,IAAI,KAAK,EAAE,CAAC;oBAAC,OAAO,KAAK,CAAC;gBAAC,CAAC;YAChC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,4CAA4C;YAC5C,mEAAmE;YACnE,wCAAwC;QAC5C,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAGO,KAAK,CAAC,mBAAmB,CAAC,EAC9B,UAAU,EACV,KAAK,EACL,eAAe,GAKlB;QACG,IAAI,CAAC,UAAU,EAAE,CAAC;YAAC,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;QAAC,CAAC;QAE7G,IAAI,IAA0B,CAAC;QAC/B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACjC,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,UAAU,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;QAAC,CAAC;QAEpH,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,qBAAqB;YACrB,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,oBAAoB;YACpB,MAAM,IAAI,KAAK,CAAC,oKAAoK,CAAC,CAAC;QAC1L,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,EAC/B,QAAQ,EACR,KAAK,EACL,eAAe,GAKlB;QACG,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,aAAa,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,aAAa,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,QAAQ,EAAE,CAAC;YAAC,MAAM,IAAI,KAAK,CAAC,wDAAwD,aAAa,eAAe,KAAK,CAAC,EAAE,wCAAwC,CAAC,CAAC;QAAC,CAAC;QACzK,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC,CAAC,uHAAuH;QAE9K,IAAI,QAAoB,CAAC;QACzB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAW,CAAC;QACrC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,SAAS,KAAK,mBAAmB,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC3H,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACrC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,OAAO,YAAY,UAAU,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnE,QAAQ,GAAG,OAAqB,CAAC;QACrC,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACzD,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACnC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1C,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,OAAiB,CAAC,CAAC;gBAC9C,QAAQ,GAAG,IAAI,UAAU,CAAC,IAAgB,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;QAGD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,EAC3B,UAAU,EACV,KAAK,EACL,eAAe,GAKlB;QACG,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,GAAG,CAAC;QAAC,CAAC;QACtD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;QACxE,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,CAAsB,CAAC;YAC/F,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;gBACpC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,EACzB,OAAO,EACP,QAAQ,EACR,UAAU,EACV,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,oCAAoC,GASvC;QACG,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC;QAEpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEhF,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEvE,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACpD,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,OAAO,IAAI,QAAQ,IAAI,QAAQ,KAAK,OAAO,IAAI,UAAU,EAAE,CAAC;YAC5D,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,IAAI,OAAO,IAAI,UAAU,IAAI,UAAU,KAAK,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC9D,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,IAAI,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1B,IAAI,OAAO,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBAClC,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,OAAO,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBACpC,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,yGAAyG,CAAC,CAAC;QAC/H,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;QAEhE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACxB,CAAC;aAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,uGAAuG;YACvG,yGAAyG;YACzG,6GAA6G;YAE7G,kCAAkC;YAClC,gCAAgC;YAChC,iCAAiC;YACjC,mCAAmC;YACnC,MAAM;YAEN,yCAAyC;YAEzC,+CAA+C;YAC/C,0DAA0D;YAC1D,4DAA4D;YAC5D,gEAAgE;YAEhE,sDAAsD;YACtD,6BAA6B;YAC7B,+BAA+B;YAC/B,mCAAmC;YACnC,iBAAiB;YACjB,2BAA2B;YAC3B,6BAA6B;YAC7B,gDAAgD;YAChD,UAAU;YAGV,yBAAyB;YACzB,uEAAuE;YACvE,QAAQ;YACR,IAAI;YAEJ,kFAAkF;YAClF,+EAA+E;YAC/E,6EAA6E;YAE7E,uBAAuB;YACvB,uBAAuB;YACvB,IAAI;YAEJ,iDAAiD;YACjD,8BAA8B;YAC9B,wBAAwB;YACxB,2DAA2D;YAC3D,SAAS;YACT,wBAAwB;YACxB,+FAA+F;YAC/F,SAAS;YACT,MAAM;YAEN,qEAAqE;YACrE,6FAA6F;YAC7F,eAAe;YACf,wEAAwE;YACxE,oEAAoE;YACpE,IAAI;YAEJ,kDAAkD;QACtD,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,sBAAsB,CAAC"}

package/dist/engine/merge/b2tfs-3way-merge-types.d.mts

@@ -0,0 +1,41 @@
+import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
+import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
+/**
+ * Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs
+ *
+ * ## note on "Details"
+ *
+ * stupid word "details" is plural and I have this set to be an
+ * array. don't have the ability to refactor right now, so this will
+ * be mildly confusing unfortunately. Agents should not try to just
+ * refactor this on the fly.
+ */
+export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the b2tfs item that points to the binary ibgib with text of the
+     * file in `main`
+     */
+    baseTextB2tFSItemAddr: IbGibAddr;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the binary ibgib whose text is in `main`
+     */
+    baseTextBinAddr: IbGibAddr | undefined;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the b2tfs item that points to the binary ibgib with text of the
+     * file in `my-feature-branch`
+     */
+    orphanTextB2tFSItemAddr: IbGibAddr;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the binary ibgib whose text is in `my-feature-branch`
+     */
+    orphanTextBinAddr: IbGibAddr | undefined;
+}
+//# sourceMappingURL=b2tfs-3way-merge-types.d.mts.map

package/dist/engine/merge/b2tfs-3way-merge-types.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"b2tfs-3way-merge-types.d.mts","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-merge-types.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F;;;;;;;;;GASG;AACH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D;;;;;OAKG;IACH,qBAAqB,EAAE,SAAS,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,uBAAuB,EAAE,SAAS,CAAC;IACnC;;;;OAIG;IACH,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;CAE5C"}

package/dist/engine/merge/b2tfs-3way-merge-types.mjs

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=b2tfs-3way-merge-types.mjs.map

package/dist/engine/merge/b2tfs-3way-merge-types.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"b2tfs-3way-merge-types.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-merge-types.mts"],"names":[],"mappings":""}

package/dist/respec-gib.node.mjs

@@ -5,7 +5,7 @@
  */
 import { RespecNodeRunner } from '@ibgib/helper-gib/dist/respec-gib/respec-node-runner.mjs';
 const runner = new RespecNodeRunner({
-    respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
+// respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
 });
 await runner.run();
 //# sourceMappingURL=respec-gib.node.mjs.map

package/dist/respec-gib.node.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"respec-gib.node.mjs","sourceRoot":"","sources":["../src/respec-gib.node.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0DAA0D,CAAC;AAE5F,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC;IAChC,gBAAgB,EAAE,kCAAkC;CACvD,CAAC,CAAC;AACH,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"respec-gib.node.mjs","sourceRoot":"","sources":["../src/respec-gib.node.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0DAA0D,CAAC;AAE5F,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC;AAChC,wDAAwD;CAC3D,CAAC,CAAC;AACH,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/vcs-gib",
-  "version": "0.0.17",
+  "version": "0.0.20",
   "private": false,
   "type": "module",
   "main": "dist/index.mjs",
@@ -19,10 +19,10 @@
     "prepare:publish": "npm version patch && node ../../build/dist/concrete-build/build-vcs-gib.mjs --prod && npm run pack"
   },
   "dependencies": {
-    "@ibgib/helper-gib": "^0.0.36",
-    "@ibgib/ts-gib": "^0.5.33",
-    "@ibgib/encrypt-gib": "^0.2.37",
-    "@ibgib/core-gib": "^0.1.70",
-    "@ibgib/node-gib": "^0.0.14"
+    "@ibgib/helper-gib": "*",
+    "@ibgib/ts-gib": "*",
+    "@ibgib/encrypt-gib": "*",
+    "@ibgib/core-gib": "*",
+    "@ibgib/node-gib": "*"
   }
 }

package/src/AUTO-GENERATED-version.mts

@@ -2,4 +2,4 @@
  * @module AUTO-GENERATED-version
  * Auto-generated version constant. Do NOT edit directly.
  */
-export const AUTO_GENERATED_VERSION = '0.0.17';
+export const AUTO_GENERATED_VERSION = '0.0.20';

package/src/bootstrap/node-bootstrap.mts

@@ -1,6 +1,6 @@
 /**
  * @module node-bootstrap
- * 
+ *
  * Rapid Node Metaspace bootstrap helper aligned with space-gib startup principles.
  * Moves execution from CLI start to "ibgib environment" rapidly without process.chdir() hacks.
  */
@@ -12,12 +12,14 @@ import { clone, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
 import { updateBootstrapIbGib } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { GraftStrategyService } from '@ibgib/core-gib/dist/sync/graft-info/graft-strategy-service.mjs';
 import { Metaspace_Nodespace } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace.mjs';
 import { NodeFilesystemSpace_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-v1.mjs';
 import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-types.mjs';
 import { fnCreateNewLocalSpace, fnDtoToSpace_nodeFilesystem } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
+import { B2tFS3WayGraftStrategy } from '../engine/merge/b2tfs-3way-merge-strategy.mjs';
 
 const lcFile = `[node-bootstrap]`;
 const logalot = GLOBAL_LOG_A_LOT;
@@ -55,6 +57,9 @@ export async function bootstrapVcsMetaspace(
     const lc = `${lcFile}[${bootstrapVcsMetaspace.name}]`;
     try {
         if (logalot) { console.log(`${lc} starting... (I: 9f8a0b1c2d3e4f5a6b7c8d9e0f1a2b3c)`); }
+
+        GraftStrategyService.instance.registerStrategy(new B2tFS3WayGraftStrategy());
+
         const {
             repoPath = process.cwd(),
             vcsFolderName = '.vcsgib',

package/src/cli/cli-constants.mts

@@ -16,6 +16,7 @@ export const VCS_SUBCOMMANDS = {
     LOG: 'log',
     BRANCH: 'branch',
     CHECKOUT: 'checkout',
+    MERGE: 'merge',
     RESET: 'reset',
     RESTORE: 'restore',
     HELP: 'help',

package/src/cli/commands/add-cmd.mts

@@ -118,11 +118,13 @@ export async function executeAddCmd({
                 }
             }
 
-            const activeBranchIbGib = branchIbGibs.find(
+            const activeBranchIbGib = branchIbGibs.findLast(
                 (b) => (b as B2tFSBranchIbGib_V1)?.data?.name === activeBranch,
-            ) as B2tFSBranchIbGib_V1 || (branchIbGibs.at(0) as B2tFSBranchIbGib_V1);
+            ) as B2tFSBranchIbGib_V1 || (branchIbGibs.at(-1) as B2tFSBranchIbGib_V1);
+
+
+            const rootItemAddr = activeBranchIbGib?.rel8ns?.b2tfs_item?.at(-1);
 
-            const rootItemAddr = activeBranchIbGib?.rel8ns?.b2tfs_item?.at(0);
             if (rootItemAddr) {
                 const rootItem = await getIbGibWithMetaspaceFallback({
                     addr: rootItemAddr,

package/src/cli/commands/branch-checkout-cmd.respec.log

@@ -0,0 +1,111 @@
+filteredRespecPaths for extra respec: C:\Users\billm\antigravity\ibgib\apps\vcs-gib\dist\cli\commands\branch-checkout-cmd.respec.mjs
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+[branch-cmd][executeBranchCmd] Branch 'feature-auth' already exists (E: 7f6a5b4c3d2e1f0a9b8c7d6e5f4a3b2c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+[checkout-cmd][executeCheckoutCmd] Branch name is required for checkout (E: 4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
+[checkout-cmd][executeCheckoutCmd] Branch 'non-existent-branch' does not exist (E: 7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+[branch-cmd][executeBranchCmd] Item 'src/utils/non-existent.js' not found in active branch snapshot (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) from space (witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] file: app.ts
+[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textLCA:
+line 1
+line 2
+line 3
+[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textBase:
+line 1 modified by main
+line 2
+line 3
+[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textOrphan:
+line 1
+line 2
+line 3 modified by secondary
+[DEBUG 3WAY] textLCA: "line 1\nline 2\nline 3"
+[DEBUG 3WAY] textBase: "line 1 modified by main\nline 2\nline 3"
+[DEBUG 3WAY] textOrphan: "line 1\nline 2\nline 3 modified by secondary"
+[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] mergedText:
+line 1 modified by main
+line 2
+line 3 modified by secondary
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 tmp_sync_recv_8824a3c1 4aae17ecb57f9c235a33ec106e718f0d763509b8ab4e4aa580b344a5a0fb419d undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ALL 3 of 3 reckonings were respecful
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates]
+ALL 9 of 9 reckonings were respecful
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ALL 15 of 15 reckonings were respecful
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ALL 4 of 4 reckonings were respecful
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ALL 3 of 3 reckonings were respecful
+💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on checkout] ALL 6 of 6 reckonings were respecful
+💔 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch][includes] Uh oh. this.value (line 1 modified by main
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
+line 2
+line 2
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+line 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
+line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
+[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ✅
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates] ✅[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ✅
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅      [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ✅        [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
+checkout] ✅
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥       4 respec files completely skipped.
+  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers] DISrespec 💔

package/src/cli/commands/{branch-checkout-cmd.respec.node.mts → branch-checkout-cmd.respec.mts}

@@ -1,6 +1,6 @@
 /**
  * @module branch-checkout-cmd.respec
- * 
+ *
  * Unit tests for `vcs branch` and `vcs checkout` command handlers & worktree projections.
  */
 
@@ -8,7 +8,8 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 
 import {
-    respecfully, ifWe, iReckon
+    respecfully, ifWe, iReckon,
+    ifWeMight
 } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 
 import { executeInitCmd } from './init-cmd.mjs';
@@ -16,13 +17,14 @@ import { executeAddCmd } from './add-cmd.mjs';
 import { executeCommitCmd } from './commit-cmd.mjs';
 import { executeBranchCmd } from './branch-cmd.mjs';
 import { executeCheckoutCmd } from './checkout-cmd.mjs';
+import { executeMergeCmd } from './merge-cmd.mjs';
 import { executeStatusCmd } from './status-cmd.mjs';
 
 const lc = `[apps/vcs-gib/src/cli/commands/branch-checkout-cmd.respec.node.mts]`;
 
-await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () => {
+await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async () => {
 
-    await ifWe(lc, `lists default branch main for new repository`, async () => {
+    await ifWeMight(lc, `lists default branch main for new repository`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_1');
         const vcsFolderName = '.vcsgib_test_bc_1';
         try {
@@ -46,7 +48,7 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
         }
     });
 
-    await ifWe(lc, `creates new branch from active branch root item and rejects duplicates`, async () => {
+    await ifWeMight(lc, `creates new branch from active branch root item and rejects duplicates`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_2');
         const vcsFolderName = '.vcsgib_test_bc_2';
         try {
@@ -110,7 +112,7 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
         }
     });
 
-    await ifWe(lc, `switches active branch with checkout and projects branch snapshot onto worktree subfolder`, async () => {
+    await ifWeMight(lc, `switches active branch with checkout and projects branch snapshot onto worktree subfolder`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_3');
         const vcsFolderName = '.vcsgib_test_bc_3';
         try {
@@ -236,7 +238,7 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
         }
     });
 
-    await ifWe(lc, `rejects checkout when branch does not exist or branchName missing`, async () => {
+    await ifWeMight(lc, `rejects checkout when branch does not exist or branchName missing`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_4');
         const vcsFolderName = '.vcsgib_test_bc_4';
         try {
@@ -278,7 +280,7 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
         }
     });
 
-    await ifWe(lc, `lists branches silently on secondary branch without error noise`, async () => {
+    await ifWeMight(lc, `lists branches silently on secondary branch without error noise`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_secondary');
         const vcsFolderName = '.vcsgib_test_bc_sec';
         try {
@@ -320,7 +322,7 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
         }
     });
 
-    await ifWe(lc, `branches single file-root item and projects into file-branch worktree on checkout`, async () => {
+    await ifWeMight(lc, `branches single file-root item and projects into file-branch worktree on checkout`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_file_root');
         const vcsFolderName = '.vcsgib_test_bc_file';
         try {
@@ -398,4 +400,105 @@ await respecfully(lc, `vcs branch and vcs checkout Command Handlers`, async () =
             await fs.rm(testDir, { recursive: true, force: true });
         }
     });
+
+    await ifWeMight(lc, `performs vcs merge end-to-end between main and secondary branch`, async () => {
+        const testDir = path.join(process.cwd(), '.test_vcs_merge_e2e');
+        const vcsFolderName = '.vcsgib_test_merge_e2e';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // 1. Initial commit on main
+            const initialContent = "line 1\nline 2\nline 3";
+            await fs.writeFile(path.join(testDir, 'app.ts'), initialContent, 'utf8');
+            await executeAddCmd({
+                paths: [path.join(testDir, 'app.ts')],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            await executeCommitCmd({
+                message: 'Initial commit on main',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // 2. Create secondary branch feature-merge
+            await executeBranchCmd({
+                branchName: 'feature-merge',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // 3. Checkout feature-merge branch and make a commit (modify line 3)
+            await executeCheckoutCmd({
+                branchName: 'feature-merge',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            const featureWorktree = path.join(testDir, 'b', 'feature-merge');
+            const featureContent = "line 1\nline 2\nline 3 modified by secondary";
+            await fs.writeFile(path.join(featureWorktree, 'app.ts'), featureContent, 'utf8');
+            await executeAddCmd({
+                paths: [path.join(featureWorktree, 'app.ts')],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            await executeCommitCmd({
+                message: 'Update app.ts on feature-merge',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // 4. Checkout main branch and make a commit (modify line 1)
+            await executeCheckoutCmd({
+                branchName: 'main',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            const mainContent = "line 1 modified by main\nline 2\nline 3";
+            await fs.writeFile(path.join(testDir, 'app.ts'), mainContent, 'utf8');
+            await executeAddCmd({
+                paths: [path.join(testDir, 'app.ts')],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            await executeCommitCmd({
+                message: 'Update app.ts on main',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // 5. Execute vcs merge feature-merge into main
+            const mergeRes = await executeMergeCmd({
+                targetBranchName: 'feature-merge',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            iReckon(lc, mergeRes.activeBranch).willEqual('main');
+            iReckon(lc, mergeRes.targetBranch).willEqual('feature-merge');
+
+            // 6. Verify projected file on physical worktree disk contains merged lines
+            const mergedAppTs = await fs.readFile(path.join(testDir, 'app.ts'), 'utf8');
+            iReckon(lc, mergedAppTs).includes('line 1 modified by main');
+            iReckon(lc, mergedAppTs).includes('line 2');
+            iReckon(lc, mergedAppTs).includes('line 3 modified by secondary');
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
 });
+

package/src/cli/commands/branch-cmd.mts

@@ -1,6 +1,6 @@
 /**
  * @module branch-cmd
- * 
+ *
  * Command handler for `vcs branch [branchName]`.
  * Lists registered branches or creates a new B2tFSBranchIbGib_V1 node registered in B2tFSIndexIbGib_V1.
  */
@@ -56,9 +56,7 @@ export async function executeBranchCmd({
 }: BranchCmdOpts = {}): Promise<BranchCmdResult> {
     const lc = `${lcFile}[${executeBranchCmd.name}]`;
     try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: 4c3d2e1f0a9b8c7d6e5f4a3b2c1d0e9f)`);
-        }
+        if (logalot) { console.log(`${lc} starting... (I: 4c3d2e1f0a9b8c7d6e5f4a3b2c1d0e9f)`); }
 
         const absTargetDir = path.resolve(targetDir);
 
@@ -124,7 +122,7 @@ export async function executeBranchCmd({
             const branches: BranchInfo[] = [];
             for (const [name, bNode] of branchMap.entries()) {
                 const addr = getIbGibAddr({ ibGib: bNode });
-                const rootItemAddr = bNode.rel8ns?.b2tfs_item?.at(0);
+                const rootItemAddr = bNode.rel8ns?.b2tfs_item?.at(-1);
                 const isActive = name === activeBranchName;
                 branches.push({
                     name,
@@ -142,6 +140,7 @@ export async function executeBranchCmd({
             }
 
             return { branches };
+
         }
 
         // CREATE BRANCH
@@ -151,7 +150,7 @@ export async function executeBranchCmd({
 
         // Find active branch root item to fork from
         const activeBranchIbGib = branchMap.get(activeBranchName) || branchIbGibs.at(0);
-        const rootItemAddr = activeBranchIbGib?.rel8ns?.b2tfs_item?.at(0);
+        const rootItemAddr = activeBranchIbGib?.rel8ns?.b2tfs_item?.at(-1);
 
         if (!rootItemAddr) {
             throw new Error(`Cannot find active branch root item to fork branch from (E: 8f7e6d5c4b3a2f1e0d9c8b7a6f5e4d3c)`);

package/src/cli/commands/checkout-cmd.mts

@@ -11,7 +11,8 @@ import fs from 'node:fs/promises';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { getIbGibsFromCache_fallbackToSpaces } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-import { putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { putInSpace, getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
@@ -100,21 +101,15 @@ export async function executeCheckoutCmd({
         }
 
         // Find target branch node
-        const targetBranchIbGib = branchIbGibs.find(
+        const targetBranchIbGib = branchIbGibs.findLast(
             (b) => b?.data?.name === trimmedBranchName,
         );
 
+
         if (!targetBranchIbGib) {
             throw new Error(`Branch '${trimmedBranchName}' does not exist (E: 7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a)`);
         }
 
-        const targetBranchAddr = getIbGibAddr({ ibGib: targetBranchIbGib });
-        const rootItemAddr = targetBranchIbGib.rel8ns?.b2tfs_item?.at(0);
-
-        if (!rootItemAddr) {
-            throw new Error(`Branch '${trimmedBranchName}' does not have a valid root item address (E: 8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b)`);
-        }
-
         // 3. Resolve target branch space b2s_<branchName>
         const targetBranchSpaceRes = await getOrCreateBranchSpace({
             metaspace,
@@ -123,6 +118,25 @@ export async function executeCheckoutCmd({
         });
         const targetBranchSpace = targetBranchSpaceRes.space;
 
+        const targetBranchAddr = getIbGibAddr({ ibGib: targetBranchIbGib });
+        const targetBranchTjpAddr = targetBranchIbGib.rel8ns?.tjp?.at(0) || targetBranchAddr;
+        const latestTargetBranchRes = await getLatestAddrs({ space: targetBranchSpace, addrs: [targetBranchTjpAddr] });
+        const latestTargetBranchAddr = (latestTargetBranchRes?.data as any)?.latestAddrs?.[0] || targetBranchAddr;
+
+
+        const latestTargetBranchIbGib = (await getIbGibWithMetaspaceFallback({
+            addr: latestTargetBranchAddr,
+            space: targetBranchSpace,
+            metaspace,
+        })) as B2tFSBranchIbGib_V1 || targetBranchIbGib;
+
+        const rootItemAddr = latestTargetBranchIbGib.rel8ns?.b2tfs_item?.at(-1);
+
+        if (!rootItemAddr) {
+            throw new Error(`Branch '${trimmedBranchName}' does not have a valid root item address (E: 8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b)`);
+        }
+
+
         await putInSpace({ space: targetBranchSpace, ibGib: targetBranchIbGib });
 
         // Update activeBranch in B2tFSIndexIbGib_V1 in targetBranchSpace and localSpace