github.com/treeverse/lakefs@v1.24.1-0.20240520134607-95648127bfb0/docs/assets/img/delta-lake/merge-conflict.excalidraw (about) 1 { 2 "type": "excalidraw", 3 "version": 2, 4 "source": "https://excalidraw.com", 5 "elements": [ 6 { 7 "type": "ellipse", 8 "version": 723, 9 "versionNonce": 2133466690, 10 "isDeleted": false, 11 "id": "ogZ6xhDLj2zCWtoP_pLWt", 12 "fillStyle": "solid", 13 "strokeWidth": 1, 14 "strokeStyle": "solid", 15 "roughness": 0, 16 "opacity": 100, 17 "angle": 0, 18 "x": -4874.160408813066, 19 "y": -4506.505037062658, 20 "strokeColor": "#1e1e1e", 21 "backgroundColor": "transparent", 22 "width": 51.445748465402175, 23 "height": 47.903921944754984, 24 "seed": 2002829378, 25 "groupIds": [], 26 "frameId": null, 27 "roundness": { 28 "type": 2 29 }, 30 "boundElements": [ 31 { 32 "id": "WLwABAOJOSDvAU7Y7yFjD", 33 "type": "arrow" 34 } 35 ], 36 "updated": 1709205338879, 37 "link": null, 38 "locked": false 39 }, 40 { 41 "type": "text", 42 "version": 653, 43 "versionNonce": 1992253150, 44 "isDeleted": false, 45 "id": "4onWMn2YDuyGxv896P6mo", 46 "fillStyle": "solid", 47 "strokeWidth": 1, 48 "strokeStyle": "solid", 49 "roughness": 0, 50 "opacity": 100, 51 "angle": 0, 52 "x": -4996.617165404867, 53 "y": -4487.939646612043, 54 "strokeColor": "#1e1e1e", 55 "backgroundColor": "transparent", 56 "width": 33.90399169921875, 57 "height": 20, 58 "seed": 463693826, 59 "groupIds": [], 60 "frameId": null, 61 "roundness": null, 62 "boundElements": [], 63 "updated": 1709205338879, 64 "link": null, 65 "locked": false, 66 "fontSize": 16, 67 "fontFamily": 1, 68 "text": "Main", 69 "textAlign": "left", 70 "verticalAlign": "top", 71 "containerId": null, 72 "originalText": "Main", 73 "lineHeight": 1.25, 74 "baseline": 14 75 }, 76 { 77 "type": "ellipse", 78 "version": 1057, 79 "versionNonce": 1586562562, 80 "isDeleted": false, 81 "id": "LLwD7_p7LskpBfMC0seH9", 82 "fillStyle": "solid", 83 "strokeWidth": 1, 84 "strokeStyle": "solid", 85 "roughness": 0, 86 "opacity": 100, 87 "angle": 0, 88 "x": -4414.71486961106, 89 "y": -4497.629609816566, 90 "strokeColor": "#1e1e1e", 91 "backgroundColor": "transparent", 92 "width": 51.445748465402175, 93 "height": 47.903921944754984, 94 "seed": 951785410, 95 "groupIds": [], 96 "frameId": null, 97 "roundness": { 98 "type": 2 99 }, 100 "boundElements": [ 101 { 102 "id": "WLwABAOJOSDvAU7Y7yFjD", 103 "type": "arrow" 104 }, 105 { 106 "id": "2UbB1KMaCo94zzVFFyzaJ", 107 "type": "arrow" 108 } 109 ], 110 "updated": 1709205338879, 111 "link": null, 112 "locked": false 113 }, 114 { 115 "type": "ellipse", 116 "version": 581, 117 "versionNonce": 1399575326, 118 "isDeleted": false, 119 "id": "pwYTqEEjmc69F11pHjYF_", 120 "fillStyle": "solid", 121 "strokeWidth": 1, 122 "strokeStyle": "solid", 123 "roughness": 0, 124 "opacity": 100, 125 "angle": 0, 126 "x": -4761.215198764938, 127 "y": -4719.065058599346, 128 "strokeColor": "#1e1e1e", 129 "backgroundColor": "transparent", 130 "width": 51.445748465402175, 131 "height": 47.903921944754984, 132 "seed": 2126958466, 133 "groupIds": [], 134 "frameId": null, 135 "roundness": { 136 "type": 2 137 }, 138 "boundElements": [ 139 { 140 "id": "1AwG7wawIuu2khWvBnauV", 141 "type": "arrow" 142 }, 143 { 144 "id": "Zmhu_d6OClqOpd2i8SGGY", 145 "type": "arrow" 146 } 147 ], 148 "updated": 1709205338879, 149 "link": null, 150 "locked": false 151 }, 152 { 153 "type": "text", 154 "version": 1006, 155 "versionNonce": 1212478914, 156 "isDeleted": false, 157 "id": "W0IxIdBb5Dii08JD7H2ok", 158 "fillStyle": "solid", 159 "strokeWidth": 1, 160 "strokeStyle": "solid", 161 "roughness": 0, 162 "opacity": 100, 163 "angle": 0, 164 "x": -5021.378123395241, 165 "y": -4705.650272396779, 166 "strokeColor": "#1971c2", 167 "backgroundColor": "transparent", 168 "width": 77.93992614746094, 169 "height": 25, 170 "seed": 1107660610, 171 "groupIds": [], 172 "frameId": null, 173 "roundness": null, 174 "boundElements": [], 175 "updated": 1709205338879, 176 "link": null, 177 "locked": false, 178 "fontSize": 20, 179 "fontFamily": 1, 180 "text": "writer_1", 181 "textAlign": "left", 182 "verticalAlign": "top", 183 "containerId": null, 184 "originalText": "writer_1", 185 "lineHeight": 1.25, 186 "baseline": 17 187 }, 188 { 189 "type": "text", 190 "version": 765, 191 "versionNonce": 50315102, 192 "isDeleted": false, 193 "id": "-s9A1E-5y1TaIoxttsW3z", 194 "fillStyle": "solid", 195 "strokeWidth": 1, 196 "strokeStyle": "solid", 197 "roughness": 0, 198 "opacity": 100, 199 "angle": 0, 200 "x": -4780.634325003079, 201 "y": -4700.357249151108, 202 "strokeColor": "#1e1e1e", 203 "backgroundColor": "transparent", 204 "width": 15.579986572265625, 205 "height": 25, 206 "seed": 1993758466, 207 "groupIds": [], 208 "frameId": null, 209 "roundness": null, 210 "boundElements": [ 211 { 212 "id": "1AwG7wawIuu2khWvBnauV", 213 "type": "arrow" 214 } 215 ], 216 "updated": 1709205338879, 217 "link": null, 218 "locked": false, 219 "fontSize": 20, 220 "fontFamily": 1, 221 "text": "b1", 222 "textAlign": "left", 223 "verticalAlign": "top", 224 "containerId": null, 225 "originalText": "b1", 226 "lineHeight": 1.25, 227 "baseline": 17 228 }, 229 { 230 "type": "ellipse", 231 "version": 1438, 232 "versionNonce": 2103766402, 233 "isDeleted": false, 234 "id": "zyeeGJMekmv4sNA5NsgZ9", 235 "fillStyle": "solid", 236 "strokeWidth": 1, 237 "strokeStyle": "solid", 238 "roughness": 0, 239 "opacity": 100, 240 "angle": 0, 241 "x": -4748.924636543954, 242 "y": -4913.101373427406, 243 "strokeColor": "#1e1e1e", 244 "backgroundColor": "transparent", 245 "width": 51.445748465402175, 246 "height": 47.903921944754984, 247 "seed": 767043266, 248 "groupIds": [], 249 "frameId": null, 250 "roundness": { 251 "type": 2 252 }, 253 "boundElements": [ 254 { 255 "id": "BSSZFIfUQiKNRu4Rlehv5", 256 "type": "arrow" 257 }, 258 { 259 "id": "kUzN5rRojuoaj26p1Biqe", 260 "type": "arrow" 261 } 262 ], 263 "updated": 1709205338879, 264 "link": null, 265 "locked": false 266 }, 267 { 268 "type": "text", 269 "version": 1382, 270 "versionNonce": 701244318, 271 "isDeleted": false, 272 "id": "8-AtRPpXAf5qu2DAJhnYo", 273 "fillStyle": "solid", 274 "strokeWidth": 1, 275 "strokeStyle": "solid", 276 "roughness": 0, 277 "opacity": 100, 278 "angle": 0, 279 "x": -5018.254038922583, 280 "y": -5016.093077005808, 281 "strokeColor": "#f08c00", 282 "backgroundColor": "transparent", 283 "width": 86.75991821289062, 284 "height": 25, 285 "seed": 256507522, 286 "groupIds": [], 287 "frameId": null, 288 "roundness": null, 289 "boundElements": [], 290 "updated": 1709205338879, 291 "link": null, 292 "locked": false, 293 "fontSize": 20, 294 "fontFamily": 1, 295 "text": "writer_2", 296 "textAlign": "left", 297 "verticalAlign": "top", 298 "containerId": null, 299 "originalText": "writer_2", 300 "lineHeight": 1.25, 301 "baseline": 17 302 }, 303 { 304 "type": "ellipse", 305 "version": 1150, 306 "versionNonce": 1127214402, 307 "isDeleted": false, 308 "id": "9lHLcujynHEODAGbzWpPQ", 309 "fillStyle": "solid", 310 "strokeWidth": 1, 311 "strokeStyle": "solid", 312 "roughness": 0, 313 "opacity": 100, 314 "angle": 0, 315 "x": -4532.408416451184, 316 "y": -4722.149829891901, 317 "strokeColor": "#1e1e1e", 318 "backgroundColor": "transparent", 319 "width": 51.445748465402175, 320 "height": 47.903921944754984, 321 "seed": 1481301570, 322 "groupIds": [], 323 "frameId": null, 324 "roundness": { 325 "type": 2 326 }, 327 "boundElements": [ 328 { 329 "id": "eAx3-tJuHqAGC3LF-JPx8", 330 "type": "arrow" 331 } 332 ], 333 "updated": 1709205338879, 334 "link": null, 335 "locked": false 336 }, 337 { 338 "type": "text", 339 "version": 346, 340 "versionNonce": 973209566, 341 "isDeleted": false, 342 "id": "AuN4vCXle-xo0AA-UkFZA", 343 "fillStyle": "solid", 344 "strokeWidth": 1, 345 "strokeStyle": "solid", 346 "roughness": 0, 347 "opacity": 100, 348 "angle": 0, 349 "x": -4677.104788347109, 350 "y": -4688.523164504064, 351 "strokeColor": "#1e1e1e", 352 "backgroundColor": "transparent", 353 "width": 127.03993225097656, 354 "height": 20, 355 "seed": 1436141058, 356 "groupIds": [], 357 "frameId": null, 358 "roundness": null, 359 "boundElements": [], 360 "updated": 1709205338879, 361 "link": null, 362 "locked": false, 363 "fontSize": 16, 364 "fontFamily": 1, 365 "text": "insert to table ", 366 "textAlign": "left", 367 "verticalAlign": "top", 368 "containerId": null, 369 "originalText": "insert to table ", 370 "lineHeight": 1.25, 371 "baseline": 14 372 }, 373 { 374 "type": "ellipse", 375 "version": 1416, 376 "versionNonce": 1594160386, 377 "isDeleted": false, 378 "id": "FIiTK_X32e1Ezqc3thhIL", 379 "fillStyle": "solid", 380 "strokeWidth": 1, 381 "strokeStyle": "solid", 382 "roughness": 0, 383 "opacity": 100, 384 "angle": 0, 385 "x": -4443.213034196717, 386 "y": -4911.350116757134, 387 "strokeColor": "#1e1e1e", 388 "backgroundColor": "transparent", 389 "width": 51.445748465402175, 390 "height": 47.903921944754984, 391 "seed": 1614132674, 392 "groupIds": [], 393 "frameId": null, 394 "roundness": { 395 "type": 2 396 }, 397 "boundElements": [ 398 { 399 "id": "2UbB1KMaCo94zzVFFyzaJ", 400 "type": "arrow" 401 }, 402 { 403 "id": "kUzN5rRojuoaj26p1Biqe", 404 "type": "arrow" 405 } 406 ], 407 "updated": 1709205338879, 408 "link": null, 409 "locked": false 410 }, 411 { 412 "type": "rectangle", 413 "version": 1770, 414 "versionNonce": 934433822, 415 "isDeleted": false, 416 "id": "M1n1GhbJ2APqr45TNVrlk", 417 "fillStyle": "solid", 418 "strokeWidth": 1, 419 "strokeStyle": "solid", 420 "roughness": 0, 421 "opacity": 100, 422 "angle": 0, 423 "x": -4823.349082948458, 424 "y": -4451.587461123878, 425 "strokeColor": "#1e1e1e", 426 "backgroundColor": "transparent", 427 "width": 155.75714111328205, 428 "height": 110, 429 "seed": 1497214338, 430 "groupIds": [], 431 "frameId": null, 432 "roundness": { 433 "type": 3 434 }, 435 "boundElements": [ 436 { 437 "type": "text", 438 "id": "kOypLf68N3ji-dtpJ5vkC" 439 }, 440 { 441 "id": "WLwABAOJOSDvAU7Y7yFjD", 442 "type": "arrow" 443 } 444 ], 445 "updated": 1709205338879, 446 "link": null, 447 "locked": false 448 }, 449 { 450 "type": "text", 451 "version": 1223, 452 "versionNonce": 308479170, 453 "isDeleted": false, 454 "id": "kOypLf68N3ji-dtpJ5vkC", 455 "fillStyle": "solid", 456 "strokeWidth": 1, 457 "strokeStyle": "solid", 458 "roughness": 0, 459 "opacity": 100, 460 "angle": 0, 461 "x": -4818.349082948458, 462 "y": -4446.587461123878, 463 "strokeColor": "#1e1e1e", 464 "backgroundColor": "transparent", 465 "width": 142.6879425048828, 466 "height": 100, 467 "seed": 636529986, 468 "groupIds": [], 469 "frameId": null, 470 "roundness": null, 471 "boundElements": [], 472 "updated": 1709205338879, 473 "link": null, 474 "locked": false, 475 "fontSize": 16, 476 "fontFamily": 1, 477 "text": "my-table/\n _delta_log/\n 0000.json\n \n ", 478 "textAlign": "left", 479 "verticalAlign": "top", 480 "containerId": "M1n1GhbJ2APqr45TNVrlk", 481 "originalText": "my-table/\n _delta_log/\n 0000.json\n \n ", 482 "lineHeight": 1.25, 483 "baseline": 94 484 }, 485 { 486 "type": "rectangle", 487 "version": 1939, 488 "versionNonce": 2093883486, 489 "isDeleted": false, 490 "id": "n4pOczy0p3JJCiL04xQoO", 491 "fillStyle": "solid", 492 "strokeWidth": 1, 493 "strokeStyle": "solid", 494 "roughness": 0, 495 "opacity": 100, 496 "angle": 0, 497 "x": -4633.7769659940495, 498 "y": -4653.760927200805, 499 "strokeColor": "#1e1e1e", 500 "backgroundColor": "transparent", 501 "width": 155.75714111328205, 502 "height": 110, 503 "seed": 732804354, 504 "groupIds": [ 505 "6iyWuhB12BXL7nOQpmsnr" 506 ], 507 "frameId": null, 508 "roundness": { 509 "type": 3 510 }, 511 "boundElements": [ 512 { 513 "type": "text", 514 "id": "SvFtSb2ysu9i39_JK-Y_p" 515 }, 516 { 517 "id": "eAx3-tJuHqAGC3LF-JPx8", 518 "type": "arrow" 519 } 520 ], 521 "updated": 1709205338879, 522 "link": null, 523 "locked": false 524 }, 525 { 526 "type": "text", 527 "version": 1391, 528 "versionNonce": 384375938, 529 "isDeleted": false, 530 "id": "SvFtSb2ysu9i39_JK-Y_p", 531 "fillStyle": "solid", 532 "strokeWidth": 1, 533 "strokeStyle": "solid", 534 "roughness": 0, 535 "opacity": 100, 536 "angle": 0, 537 "x": -4628.7769659940495, 538 "y": -4648.760927200805, 539 "strokeColor": "#1e1e1e", 540 "backgroundColor": "transparent", 541 "width": 142.6879425048828, 542 "height": 100, 543 "seed": 1274266818, 544 "groupIds": [ 545 "6iyWuhB12BXL7nOQpmsnr" 546 ], 547 "frameId": null, 548 "roundness": null, 549 "boundElements": [], 550 "updated": 1709205338879, 551 "link": null, 552 "locked": false, 553 "fontSize": 16, 554 "fontFamily": 1, 555 "text": "my-table/\n _delta_log/\n 0000.json\n \n ", 556 "textAlign": "left", 557 "verticalAlign": "top", 558 "containerId": "n4pOczy0p3JJCiL04xQoO", 559 "originalText": "my-table/\n _delta_log/\n 0000.json\n \n ", 560 "lineHeight": 1.25, 561 "baseline": 94 562 }, 563 { 564 "type": "text", 565 "version": 322, 566 "versionNonce": 2099668126, 567 "isDeleted": false, 568 "id": "wyjveP0Tl9iJsRVzaYDSn", 569 "fillStyle": "solid", 570 "strokeWidth": 1, 571 "strokeStyle": "solid", 572 "roughness": 0, 573 "opacity": 100, 574 "angle": 0, 575 "x": -4564.970399483169, 576 "y": -4587.317445755492, 577 "strokeColor": "#1971c2", 578 "backgroundColor": "transparent", 579 "width": 72.01594543457031, 580 "height": 20, 581 "seed": 1617026178, 582 "groupIds": [ 583 "6iyWuhB12BXL7nOQpmsnr" 584 ], 585 "frameId": null, 586 "roundness": null, 587 "boundElements": [], 588 "updated": 1709205338879, 589 "link": null, 590 "locked": false, 591 "fontSize": 16, 592 "fontFamily": 1, 593 "text": "0001.json", 594 "textAlign": "left", 595 "verticalAlign": "top", 596 "containerId": null, 597 "originalText": "0001.json", 598 "lineHeight": 1.25, 599 "baseline": 14 600 }, 601 { 602 "type": "rectangle", 603 "version": 2119, 604 "versionNonce": 441859138, 605 "isDeleted": false, 606 "id": "X52u9_BiHmIFEHej-Oxlf", 607 "fillStyle": "solid", 608 "strokeWidth": 1, 609 "strokeStyle": "solid", 610 "roughness": 0, 611 "opacity": 100, 612 "angle": 0, 613 "x": -4579.791605041528, 614 "y": -4848.161354044467, 615 "strokeColor": "#1e1e1e", 616 "backgroundColor": "transparent", 617 "width": 155.75714111328205, 618 "height": 110, 619 "seed": 917961794, 620 "groupIds": [ 621 "5AgixBmPhcSGPPH16TUb-" 622 ], 623 "frameId": null, 624 "roundness": { 625 "type": 3 626 }, 627 "boundElements": [ 628 { 629 "type": "text", 630 "id": "mstR-FmjOT92MIwTn27yT" 631 }, 632 { 633 "id": "2UbB1KMaCo94zzVFFyzaJ", 634 "type": "arrow" 635 } 636 ], 637 "updated": 1709205338879, 638 "link": null, 639 "locked": false 640 }, 641 { 642 "type": "text", 643 "version": 1571, 644 "versionNonce": 174858462, 645 "isDeleted": false, 646 "id": "mstR-FmjOT92MIwTn27yT", 647 "fillStyle": "solid", 648 "strokeWidth": 1, 649 "strokeStyle": "solid", 650 "roughness": 0, 651 "opacity": 100, 652 "angle": 0, 653 "x": -4574.791605041528, 654 "y": -4843.161354044467, 655 "strokeColor": "#1e1e1e", 656 "backgroundColor": "transparent", 657 "width": 142.6879425048828, 658 "height": 100, 659 "seed": 215098370, 660 "groupIds": [ 661 "5AgixBmPhcSGPPH16TUb-" 662 ], 663 "frameId": null, 664 "roundness": null, 665 "boundElements": [], 666 "updated": 1709205338879, 667 "link": null, 668 "locked": false, 669 "fontSize": 16, 670 "fontFamily": 1, 671 "text": "my-table/\n _delta_log/\n 0000.json\n \n ", 672 "textAlign": "left", 673 "verticalAlign": "top", 674 "containerId": "X52u9_BiHmIFEHej-Oxlf", 675 "originalText": "my-table/\n _delta_log/\n 0000.json\n \n ", 676 "lineHeight": 1.25, 677 "baseline": 94 678 }, 679 { 680 "type": "text", 681 "version": 502, 682 "versionNonce": 982082562, 683 "isDeleted": false, 684 "id": "h3Uxd9SHfAxqlA8lGGhlh", 685 "fillStyle": "solid", 686 "strokeWidth": 1, 687 "strokeStyle": "solid", 688 "roughness": 0, 689 "opacity": 100, 690 "angle": 0, 691 "x": -4510.985038530647, 692 "y": -4781.7178725991525, 693 "strokeColor": "#f08c00", 694 "backgroundColor": "transparent", 695 "width": 72.01594543457031, 696 "height": 20, 697 "seed": 213013442, 698 "groupIds": [ 699 "5AgixBmPhcSGPPH16TUb-" 700 ], 701 "frameId": null, 702 "roundness": null, 703 "boundElements": [], 704 "updated": 1709205338879, 705 "link": null, 706 "locked": false, 707 "fontSize": 16, 708 "fontFamily": 1, 709 "text": "0001.json", 710 "textAlign": "left", 711 "verticalAlign": "top", 712 "containerId": null, 713 "originalText": "0001.json", 714 "lineHeight": 1.25, 715 "baseline": 14 716 }, 717 { 718 "type": "text", 719 "version": 420, 720 "versionNonce": 405820702, 721 "isDeleted": false, 722 "id": "jGTLUs8NOf4XHQ71uklsv", 723 "fillStyle": "solid", 724 "strokeWidth": 1, 725 "strokeStyle": "solid", 726 "roughness": 0, 727 "opacity": 100, 728 "angle": 0, 729 "x": -4617.846880675621, 730 "y": -4876.945196697177, 731 "strokeColor": "#1e1e1e", 732 "backgroundColor": "transparent", 733 "width": 127.03993225097656, 734 "height": 20, 735 "seed": 1215728514, 736 "groupIds": [], 737 "frameId": null, 738 "roundness": null, 739 "boundElements": [ 740 { 741 "id": "kUzN5rRojuoaj26p1Biqe", 742 "type": "arrow" 743 } 744 ], 745 "updated": 1709205338879, 746 "link": null, 747 "locked": false, 748 "fontSize": 16, 749 "fontFamily": 1, 750 "text": "insert to table ", 751 "textAlign": "left", 752 "verticalAlign": "top", 753 "containerId": null, 754 "originalText": "insert to table ", 755 "lineHeight": 1.25, 756 "baseline": 14 757 }, 758 { 759 "type": "arrow", 760 "version": 918, 761 "versionNonce": 25269186, 762 "isDeleted": false, 763 "id": "eAx3-tJuHqAGC3LF-JPx8", 764 "fillStyle": "solid", 765 "strokeWidth": 1, 766 "strokeStyle": "solid", 767 "roughness": 0, 768 "opacity": 100, 769 "angle": 0, 770 "x": -4494.295583776001, 771 "y": -4676.349554147726, 772 "strokeColor": "#1e1e1e", 773 "backgroundColor": "transparent", 774 "width": 93.69919137050329, 775 "height": 181.92035974070404, 776 "seed": 912116546, 777 "groupIds": [], 778 "frameId": null, 779 "roundness": { 780 "type": 2 781 }, 782 "boundElements": [], 783 "updated": 1709205338879, 784 "link": null, 785 "locked": false, 786 "startBinding": { 787 "elementId": "n4pOczy0p3JJCiL04xQoO", 788 "focus": -0.9562988901370194, 789 "gap": 22.588626946921067 790 }, 791 "endBinding": null, 792 "lastCommittedPoint": null, 793 "startArrowhead": null, 794 "endArrowhead": "arrow", 795 "points": [ 796 [ 797 0, 798 0 799 ], 800 [ 801 93.69919137050329, 802 181.92035974070404 803 ] 804 ] 805 }, 806 { 807 "type": "rectangle", 808 "version": 2019, 809 "versionNonce": 1633536898, 810 "isDeleted": false, 811 "id": "jEpOc9gA9ECPKB7-xBSI9", 812 "fillStyle": "solid", 813 "strokeWidth": 1, 814 "strokeStyle": "solid", 815 "roughness": 0, 816 "opacity": 100, 817 "angle": 0, 818 "x": -4445.877185720612, 819 "y": -4442.136724682132, 820 "strokeColor": "#1e1e1e", 821 "backgroundColor": "transparent", 822 "width": 155.75714111328205, 823 "height": 110, 824 "seed": 1580294850, 825 "groupIds": [ 826 "xYKUDi2W49YoCvXGyJL6e" 827 ], 828 "frameId": null, 829 "roundness": { 830 "type": 3 831 }, 832 "boundElements": [ 833 { 834 "type": "text", 835 "id": "GgXUZoq4b8dgEhIsBvKwx" 836 } 837 ], 838 "updated": 1709205338879, 839 "link": null, 840 "locked": false 841 }, 842 { 843 "type": "text", 844 "version": 1472, 845 "versionNonce": 1155016094, 846 "isDeleted": false, 847 "id": "GgXUZoq4b8dgEhIsBvKwx", 848 "fillStyle": "solid", 849 "strokeWidth": 1, 850 "strokeStyle": "solid", 851 "roughness": 0, 852 "opacity": 100, 853 "angle": 0, 854 "x": -4440.877185720612, 855 "y": -4437.136724682132, 856 "strokeColor": "#1e1e1e", 857 "backgroundColor": "transparent", 858 "width": 142.6879425048828, 859 "height": 100, 860 "seed": 1429977730, 861 "groupIds": [ 862 "xYKUDi2W49YoCvXGyJL6e" 863 ], 864 "frameId": null, 865 "roundness": null, 866 "boundElements": [], 867 "updated": 1709205338879, 868 "link": null, 869 "locked": false, 870 "fontSize": 16, 871 "fontFamily": 1, 872 "text": "my-table/\n _delta_log/\n 0000.json\n \n ", 873 "textAlign": "left", 874 "verticalAlign": "top", 875 "containerId": "jEpOc9gA9ECPKB7-xBSI9", 876 "originalText": "my-table/\n _delta_log/\n 0000.json\n \n ", 877 "lineHeight": 1.25, 878 "baseline": 94 879 }, 880 { 881 "type": "text", 882 "version": 404, 883 "versionNonce": 811404098, 884 "isDeleted": false, 885 "id": "wb0_cbs-iPoF9sBYWHVv-", 886 "fillStyle": "solid", 887 "strokeWidth": 1, 888 "strokeStyle": "solid", 889 "roughness": 0, 890 "opacity": 100, 891 "angle": 0, 892 "x": -4377.070619209731, 893 "y": -4375.693243236819, 894 "strokeColor": "#1971c2", 895 "backgroundColor": "transparent", 896 "width": 72.01594543457031, 897 "height": 20, 898 "seed": 1889868354, 899 "groupIds": [ 900 "xYKUDi2W49YoCvXGyJL6e" 901 ], 902 "frameId": null, 903 "roundness": null, 904 "boundElements": [], 905 "updated": 1709205338879, 906 "link": null, 907 "locked": false, 908 "fontSize": 16, 909 "fontFamily": 1, 910 "text": "0001.json", 911 "textAlign": "left", 912 "verticalAlign": "top", 913 "containerId": null, 914 "originalText": "0001.json", 915 "lineHeight": 1.25, 916 "baseline": 14 917 }, 918 { 919 "type": "arrow", 920 "version": 1189, 921 "versionNonce": 1480442334, 922 "isDeleted": false, 923 "id": "2UbB1KMaCo94zzVFFyzaJ", 924 "fillStyle": "solid", 925 "strokeWidth": 1, 926 "strokeStyle": "solid", 927 "roughness": 0, 928 "opacity": 100, 929 "angle": 0, 930 "x": -4409.411395697797, 931 "y": -4858.488569181136, 932 "strokeColor": "#1e1e1e", 933 "backgroundColor": "transparent", 934 "width": 19.946068101089622, 935 "height": 359.8628738488396, 936 "seed": 1598849538, 937 "groupIds": [], 938 "frameId": null, 939 "roundness": { 940 "type": 2 941 }, 942 "boundElements": [], 943 "updated": 1709205338879, 944 "link": null, 945 "locked": false, 946 "startBinding": { 947 "elementId": "X52u9_BiHmIFEHej-Oxlf", 948 "focus": -1.187767547939438, 949 "gap": 14.932425499329838 950 }, 951 "endBinding": { 952 "elementId": "LLwD7_p7LskpBfMC0seH9", 953 "focus": 0.03530906917672053, 954 "gap": 1 955 }, 956 "lastCommittedPoint": null, 957 "startArrowhead": null, 958 "endArrowhead": "arrow", 959 "points": [ 960 [ 961 0, 962 0 963 ], 964 [ 965 19.946068101089622, 966 359.8628738488396 967 ] 968 ] 969 }, 970 { 971 "type": "arrow", 972 "version": 564, 973 "versionNonce": 618550018, 974 "isDeleted": false, 975 "id": "kUzN5rRojuoaj26p1Biqe", 976 "fillStyle": "solid", 977 "strokeWidth": 1, 978 "strokeStyle": "solid", 979 "roughness": 0, 980 "opacity": 100, 981 "angle": 0, 982 "x": -4693.745276794551, 983 "y": -4892.283184485677, 984 "strokeColor": "#1e1e1e", 985 "backgroundColor": "transparent", 986 "width": 250.17607011271957, 987 "height": 0.1822173504415332, 988 "seed": 472969666, 989 "groupIds": [], 990 "frameId": null, 991 "roundness": { 992 "type": 2 993 }, 994 "boundElements": [], 995 "updated": 1709205338879, 996 "link": null, 997 "locked": false, 998 "startBinding": { 999 "elementId": "zyeeGJMekmv4sNA5NsgZ9", 1000 "focus": -0.13173142231619034, 1001 "gap": 3.9214480665472067 1002 }, 1003 "endBinding": { 1004 "elementId": "FIiTK_X32e1Ezqc3thhIL", 1005 "focus": 0.19555038025911065, 1006 "gap": 1 1007 }, 1008 "lastCommittedPoint": null, 1009 "startArrowhead": null, 1010 "endArrowhead": "arrow", 1011 "points": [ 1012 [ 1013 0, 1014 0 1015 ], 1016 [ 1017 250.17607011271957, 1018 0.1822173504415332 1019 ] 1020 ] 1021 }, 1022 { 1023 "type": "text", 1024 "version": 237, 1025 "versionNonce": 1562760734, 1026 "isDeleted": false, 1027 "id": "itvK8N-Zu8RRRiLKZFlF-", 1028 "fillStyle": "solid", 1029 "strokeWidth": 1, 1030 "strokeStyle": "solid", 1031 "roughness": 0, 1032 "opacity": 100, 1033 "angle": 0, 1034 "x": -4373.438068288975, 1035 "y": -4693.725003651696, 1036 "strokeColor": "#e03131", 1037 "backgroundColor": "transparent", 1038 "width": 239.95187377929688, 1039 "height": 20, 1040 "seed": 1785817474, 1041 "groupIds": [], 1042 "frameId": null, 1043 "roundness": null, 1044 "boundElements": [], 1045 "updated": 1709205338879, 1046 "link": null, 1047 "locked": false, 1048 "fontSize": 16, 1049 "fontFamily": 1, 1050 "text": "Merge fails due to a conflict ", 1051 "textAlign": "left", 1052 "verticalAlign": "top", 1053 "containerId": null, 1054 "originalText": "Merge fails due to a conflict ", 1055 "lineHeight": 1.25, 1056 "baseline": 14 1057 }, 1058 { 1059 "type": "line", 1060 "version": 352, 1061 "versionNonce": 1365287618, 1062 "isDeleted": false, 1063 "id": "WT2vugnQfYCHjuts054FT", 1064 "fillStyle": "solid", 1065 "strokeWidth": 4, 1066 "strokeStyle": "solid", 1067 "roughness": 0, 1068 "opacity": 100, 1069 "angle": 0, 1070 "x": -4387.246487652812, 1071 "y": -4680.468472889977, 1072 "strokeColor": "#e03131", 1073 "backgroundColor": "transparent", 1074 "width": 13.118373325894026, 1075 "height": 17.951572963169383, 1076 "seed": 1363994946, 1077 "groupIds": [ 1078 "jdLwdOPNVKmDtD3-vXPaA" 1079 ], 1080 "frameId": null, 1081 "roundness": { 1082 "type": 2 1083 }, 1084 "boundElements": [], 1085 "updated": 1709205338879, 1086 "link": null, 1087 "locked": false, 1088 "startBinding": null, 1089 "endBinding": null, 1090 "lastCommittedPoint": null, 1091 "startArrowhead": null, 1092 "endArrowhead": null, 1093 "points": [ 1094 [ 1095 0, 1096 0 1097 ], 1098 [ 1099 -13.118373325894026, 1100 17.951572963169383 1101 ] 1102 ] 1103 }, 1104 { 1105 "type": "line", 1106 "version": 562, 1107 "versionNonce": 1820418654, 1108 "isDeleted": false, 1109 "id": "90Zf7fZd5ulllMEm5WsuN", 1110 "fillStyle": "solid", 1111 "strokeWidth": 4, 1112 "strokeStyle": "solid", 1113 "roughness": 0, 1114 "opacity": 100, 1115 "angle": 0, 1116 "x": -4400.957250766653, 1117 "y": -4679.711898531717, 1118 "strokeColor": "#e03131", 1119 "backgroundColor": "transparent", 1120 "width": 14.59167480468659, 1121 "height": 15.397382463726899, 1122 "seed": 404910338, 1123 "groupIds": [ 1124 "jdLwdOPNVKmDtD3-vXPaA" 1125 ], 1126 "frameId": null, 1127 "roundness": { 1128 "type": 2 1129 }, 1130 "boundElements": [], 1131 "updated": 1709205338879, 1132 "link": null, 1133 "locked": false, 1134 "startBinding": null, 1135 "endBinding": null, 1136 "lastCommittedPoint": null, 1137 "startArrowhead": null, 1138 "endArrowhead": null, 1139 "points": [ 1140 [ 1141 0, 1142 0 1143 ], 1144 [ 1145 14.59167480468659, 1146 15.397382463726899 1147 ] 1148 ] 1149 }, 1150 { 1151 "type": "arrow", 1152 "version": 718, 1153 "versionNonce": 545454722, 1154 "isDeleted": false, 1155 "id": "WLwABAOJOSDvAU7Y7yFjD", 1156 "fillStyle": "solid", 1157 "strokeWidth": 1, 1158 "strokeStyle": "solid", 1159 "roughness": 0, 1160 "opacity": 100, 1161 "angle": 0, 1162 "x": -4820.558902143084, 1163 "y": -4479.856055443219, 1164 "strokeColor": "#1e1e1e", 1165 "backgroundColor": "transparent", 1166 "width": 404.6595485926555, 1167 "height": 2.1077378845993735, 1168 "seed": 1114702018, 1169 "groupIds": [], 1170 "frameId": null, 1171 "roundness": { 1172 "type": 2 1173 }, 1174 "boundElements": [], 1175 "updated": 1709205338879, 1176 "link": null, 1177 "locked": false, 1178 "startBinding": { 1179 "elementId": "ogZ6xhDLj2zCWtoP_pLWt", 1180 "focus": 0.10653700306491325, 1181 "gap": 2.3039530047365133 1182 }, 1183 "endBinding": { 1184 "elementId": "LLwD7_p7LskpBfMC0seH9", 1185 "focus": 0.16409744857823455, 1186 "gap": 1.5343036149306961 1187 }, 1188 "lastCommittedPoint": null, 1189 "startArrowhead": null, 1190 "endArrowhead": "arrow", 1191 "points": [ 1192 [ 1193 0, 1194 0 1195 ], 1196 [ 1197 404.6595485926555, 1198 2.1077378845993735 1199 ] 1200 ] 1201 }, 1202 { 1203 "type": "rectangle", 1204 "version": 557, 1205 "versionNonce": 1908654594, 1206 "isDeleted": false, 1207 "id": "6AuEHwE3GbF_AEtNUpOi3", 1208 "fillStyle": "solid", 1209 "strokeWidth": 1, 1210 "strokeStyle": "dotted", 1211 "roughness": 0, 1212 "opacity": 100, 1213 "angle": 0, 1214 "x": -5038.888221585141, 1215 "y": -5045.482805719315, 1216 "strokeColor": "#f08c00", 1217 "backgroundColor": "transparent", 1218 "width": 669.6878387115825, 1219 "height": 313.1841823032928, 1220 "seed": 1795743746, 1221 "groupIds": [], 1222 "frameId": null, 1223 "roundness": null, 1224 "boundElements": [ 1225 { 1226 "id": "BSSZFIfUQiKNRu4Rlehv5", 1227 "type": "arrow" 1228 } 1229 ], 1230 "updated": 1709205338879, 1231 "link": null, 1232 "locked": false 1233 }, 1234 { 1235 "type": "rectangle", 1236 "version": 888, 1237 "versionNonce": 1322440478, 1238 "isDeleted": false, 1239 "id": "E3Z-rmUWZoIBam9yOArN6", 1240 "fillStyle": "solid", 1241 "strokeWidth": 1, 1242 "strokeStyle": "dotted", 1243 "roughness": 0, 1244 "opacity": 100, 1245 "angle": 0, 1246 "x": -5037.20835969898, 1247 "y": -4721.684812635738, 1248 "strokeColor": "#1971c2", 1249 "backgroundColor": "transparent", 1250 "width": 668.0315021892181, 1251 "height": 188.8683344243646, 1252 "seed": 1823576002, 1253 "groupIds": [], 1254 "frameId": null, 1255 "roundness": null, 1256 "boundElements": [ 1257 { 1258 "id": "1AwG7wawIuu2khWvBnauV", 1259 "type": "arrow" 1260 }, 1261 { 1262 "id": "BSSZFIfUQiKNRu4Rlehv5", 1263 "type": "arrow" 1264 } 1265 ], 1266 "updated": 1709205338879, 1267 "link": null, 1268 "locked": false 1269 }, 1270 { 1271 "type": "arrow", 1272 "version": 1609, 1273 "versionNonce": 989908930, 1274 "isDeleted": false, 1275 "id": "1AwG7wawIuu2khWvBnauV", 1276 "fillStyle": "solid", 1277 "strokeWidth": 1, 1278 "strokeStyle": "solid", 1279 "roughness": 0, 1280 "opacity": 100, 1281 "angle": 0, 1282 "x": -4834.608650019732, 1283 "y": -4504.732350186047, 1284 "strokeColor": "#1e1e1e", 1285 "backgroundColor": "transparent", 1286 "width": 81.79272997921726, 1287 "height": 168.82151191470984, 1288 "seed": 753795970, 1289 "groupIds": [], 1290 "frameId": null, 1291 "roundness": null, 1292 "boundElements": [], 1293 "updated": 1709205338879, 1294 "link": null, 1295 "locked": false, 1296 "startBinding": { 1297 "elementId": "E3Z-rmUWZoIBam9yOArN6", 1298 "focus": -0.18973897987154792, 1299 "gap": 28.084128025325754 1300 }, 1301 "endBinding": { 1302 "elementId": "-s9A1E-5y1TaIoxttsW3z", 1303 "focus": -1.9469887223595808, 1304 "gap": 12.238418390298648 1305 }, 1306 "lastCommittedPoint": null, 1307 "startArrowhead": null, 1308 "endArrowhead": "arrow", 1309 "points": [ 1310 [ 1311 0, 1312 0 1313 ], 1314 [ 1315 81.79272997921726, 1316 -168.82151191470984 1317 ] 1318 ] 1319 }, 1320 { 1321 "type": "arrow", 1322 "version": 3003, 1323 "versionNonce": 235308382, 1324 "isDeleted": false, 1325 "id": "BSSZFIfUQiKNRu4Rlehv5", 1326 "fillStyle": "solid", 1327 "strokeWidth": 1, 1328 "strokeStyle": "solid", 1329 "roughness": 0, 1330 "opacity": 100, 1331 "angle": 0, 1332 "x": -4845.6801434550825, 1333 "y": -4506.576247150813, 1334 "strokeColor": "#1e1e1e", 1335 "backgroundColor": "transparent", 1336 "width": 107.13697027572653, 1337 "height": 359.1605733587958, 1338 "seed": 220611394, 1339 "groupIds": [], 1340 "frameId": null, 1341 "roundness": null, 1342 "boundElements": [], 1343 "updated": 1709205338879, 1344 "link": null, 1345 "locked": false, 1346 "startBinding": { 1347 "elementId": "E3Z-rmUWZoIBam9yOArN6", 1348 "focus": -0.29402235190910925, 1349 "gap": 26.240231060559836 1350 }, 1351 "endBinding": { 1352 "elementId": "zyeeGJMekmv4sNA5NsgZ9", 1353 "focus": 0.3130525348324614, 1354 "gap": 3.5398723098396054 1355 }, 1356 "lastCommittedPoint": null, 1357 "startArrowhead": null, 1358 "endArrowhead": "arrow", 1359 "points": [ 1360 [ 1361 0, 1362 0 1363 ], 1364 [ 1365 107.13697027572653, 1366 -359.1605733587958 1367 ] 1368 ] 1369 }, 1370 { 1371 "type": "arrow", 1372 "version": 275, 1373 "versionNonce": 529893250, 1374 "isDeleted": false, 1375 "id": "Zmhu_d6OClqOpd2i8SGGY", 1376 "fillStyle": "solid", 1377 "strokeWidth": 1, 1378 "strokeStyle": "solid", 1379 "roughness": 0, 1380 "opacity": 100, 1381 "angle": 0, 1382 "x": -4708.833474763065, 1383 "y": -4698.500519625166, 1384 "strokeColor": "#1e1e1e", 1385 "backgroundColor": "transparent", 1386 "width": 177.86420549665127, 1387 "height": 1.169651576450633, 1388 "seed": 62950146, 1389 "groupIds": [], 1390 "frameId": null, 1391 "roundness": null, 1392 "boundElements": [], 1393 "updated": 1709205338879, 1394 "link": null, 1395 "locked": false, 1396 "startBinding": { 1397 "elementId": "pwYTqEEjmc69F11pHjYF_", 1398 "focus": -0.1487412340172701, 1399 "gap": 1.1813995419280694 1400 }, 1401 "endBinding": null, 1402 "lastCommittedPoint": null, 1403 "startArrowhead": null, 1404 "endArrowhead": "arrow", 1405 "points": [ 1406 [ 1407 0, 1408 0 1409 ], 1410 [ 1411 177.86420549665127, 1412 1.169651576450633 1413 ] 1414 ] 1415 }, 1416 { 1417 "type": "text", 1418 "version": 944, 1419 "versionNonce": 1946823070, 1420 "isDeleted": false, 1421 "id": "ku9fwnNuiqyc625XEumnj", 1422 "fillStyle": "solid", 1423 "strokeWidth": 1, 1424 "strokeStyle": "solid", 1425 "roughness": 0, 1426 "opacity": 100, 1427 "angle": 0, 1428 "x": -4781.085874121029, 1429 "y": -4896.7100993141175, 1430 "strokeColor": "#1e1e1e", 1431 "backgroundColor": "transparent", 1432 "width": 24.399978637695312, 1433 "height": 25, 1434 "seed": 121363138, 1435 "groupIds": [], 1436 "frameId": null, 1437 "roundness": null, 1438 "boundElements": [ 1439 { 1440 "id": "BSSZFIfUQiKNRu4Rlehv5", 1441 "type": "arrow" 1442 } 1443 ], 1444 "updated": 1709205338879, 1445 "link": null, 1446 "locked": false, 1447 "fontSize": 20, 1448 "fontFamily": 1, 1449 "text": "b2", 1450 "textAlign": "left", 1451 "verticalAlign": "top", 1452 "containerId": null, 1453 "originalText": "b2", 1454 "lineHeight": 1.25, 1455 "baseline": 17 1456 }, 1457 { 1458 "type": "text", 1459 "version": 256, 1460 "versionNonce": 1519338974, 1461 "isDeleted": false, 1462 "id": "wdm8lY-Pc3nWnX4OKAv9I", 1463 "fillStyle": "solid", 1464 "strokeWidth": 1, 1465 "strokeStyle": "solid", 1466 "roughness": 0, 1467 "opacity": 100, 1468 "angle": 0, 1469 "x": -5048.63663120371, 1470 "y": -5118.105719398638, 1471 "strokeColor": "#1e1e1e", 1472 "backgroundColor": "transparent", 1473 "width": 723.295654296875, 1474 "height": 35, 1475 "seed": 1131516482, 1476 "groupIds": [], 1477 "frameId": null, 1478 "roundness": null, 1479 "boundElements": [], 1480 "updated": 1709205338879, 1481 "link": null, 1482 "locked": false, 1483 "fontSize": 28, 1484 "fontFamily": 1, 1485 "text": "Merge conflicts by Multi-writers to multiple branches", 1486 "textAlign": "left", 1487 "verticalAlign": "top", 1488 "containerId": null, 1489 "originalText": "Merge conflicts by Multi-writers to multiple branches", 1490 "lineHeight": 1.25, 1491 "baseline": 24 1492 } 1493 ], 1494 "appState": { 1495 "gridSize": null, 1496 "viewBackgroundColor": "#ffffff" 1497 }, 1498 "files": {} 1499 }