ci(): changelog action + merge directive

[ShaMan123]

The changelog action is failing due to an unknown reason on #8135 , see failing job and CHANGELOG

This PR removes the action and adds a simple diff command to check if the file has changed instead of the action

In addition added .gitattribute instructing git to do a merge union in case of conflicts in CHANGLOG.

[github-actions]

Coverage after merging ci-changelog into master will be

82.35%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
HEADER.js	54.90%	48.15%	0%	65.22%	105, 105, 105, 12, 14, 14, 14, 14, 14, 16–17, 21, 21–22, 22, 22, 24, 24, 26, 28, 30–31
src
cache.ts	97.06%	90%	100%	100%	57
canvas.class.ts	93.44%	90.36%	94.23%	95.58%	1078, 1078–1079, 1082, 1102, 1102, 1137, 1170–1171, 1199–1200, 1233, 1241, 1351–1352, 1354–1355, 1375–1376, 1534, 1539, 1549, 1553, 486–487, 492, 501, 650–652, 697–698, 762–763, 766, 768, 815–817, 859, 864–865, 893–894
config.ts	77.27%	66.67%	66.67%	84.62%	130, 138–140, 151–153
constants.ts	100%	100%	100%	100%
intersection.class.ts	100%	100%	100%	100%
pattern.class.ts	92.19%	85.71%	100%	96.30%	110, 116, 127, 136, 88
point.class.ts	100%	100%	100%	100%
shadow.class.ts	95.95%	90%	100%	100%	173, 240, 9
static_canvas.class.ts	90.21%	83.99%	96.77%	92.82%	1153–1154, 1154, 1154–1155, 1289, 1355–1356, 1359, 1408–1409, 1502, 1517, 1521, 1547–1548, 1577–1578, 1611–1612, 1653–1654, 1657, 1659, 1659, 1659, 1659, 1663, 1663, 1663–1665, 1687–1688, 1729–1730, 1733, 1735, 1735, 1735, 1735, 1739, 1739, 1739–1741, 1814, 1814–1815, 1888, 1890, 1890, 1890, 1890, 1890–1891, 1894–1895, 1895, 1895–1896, 1899, 1899, 1899, 1901, 1904, 1910, 1912–1913, 1913, 1913, 1916–1917, 1917, 1917, 1920, 279–280, 282–283, 285–286, 299–300, 302–303, 617, 643, 699–702, 902
src/brushes
base_brush.class.ts	100%	100%	100%	100%
circle_brush.class.ts	2.99%	0%	0%	3.92%	100–101, 103, 105–107, 116, 116, 116, 118, 120, 122–124, 126–129, 137, 144, 146, 26, 31–32, 40–44, 48–52, 59–62, 70–74, 76, 84, 84, 84, 84, 84–85, 87, 87, 87–90, 92
pattern_brush.class.ts	5.26%	0%	0%	8.33%	16, 20–23, 25–26, 26, 26–29, 37–38, 40, 44, 55, 55, 55, 63–65, 65, 65, 72–73, 75–76, 76, 80
pencil_brush.class.ts	91.95%	85.42%	100%	93.69%	125–126, 155, 155–157, 279, 283, 288–289, 71–72, 87–88
spray_brush.class.ts	2.30%	0%	0%	3.08%	102–104, 106–107, 115, 115, 115, 115, 115–116, 118–119, 126–127, 129, 131–135, 144, 148–149, 149, 157, 157, 157–160, 162–165, 169–170, 172, 174–177, 180, 187–188, 190, 192–193, 195, 202–203, 205–206, 209, 209, 216, 216, 220, 25–26, 28–30, 30, 30–32, 36, 45, 52, 59, 66, 73, 80, 92–94
src/color
color.class.ts	91.67%	84.51%	100%	94.44%	325–326, 330–331, 334–335, 41, 45, 72–73, 73, 75, 75, 75–76, 78–79
color_map.ts	100%	100%	100%	100%
constants.ts	100%	100%	100%	100%
index.ts	100%	100%	100%	100%
util.ts	100%	100%	100%	100%
src/controls
control.class.ts	90.24%	81.48%	86.67%	97.50%	210, 304, 304, 348, 372, 6
controls.actions.ts	76.80%	69.20%	93.75%	80.67%	161, 163, 163, 163, 165, 167, 26, 28, 28, 28, 290–293, 321, 323, 330–331, 333, 333–334, 336–337, 341, 373, 375, 382–383, 385, 385–386, 388–389, 393, 421–422, 424, 426, 431, 434, 434, 434–435, 435, 435, 437, 437, 437–438, 438, 438, 441, 441, 441–442, 442, 442, 475–476, 478, 480, 485, 488, 488, 488–489, 489, 489, 491, 491, 491–492, 492, 492, 495, 495, 495–496, 496, 496, 520–522, 528, 528, 528–529, 532–535, 537, 537, 537–539, 539, 539–541, 543, 543, 543–545, 545, 545–546, 551, 551, 551–552, 554, 556–558, 57, 589–590, 592–594, 641–643, 8, 841
controls.render.ts	85.11%	84.78%	100%	84.78%	23, 27, 42–49, 58–59, 82, 86
default_controls.ts	94.29%	50%	100%	100%	117, 85
src/filters
2d_backend.class.ts	96.43%	83.33%	100%	100%	78
WebGLProbe.ts	40%	40%	57.14%	34.78%	38–39, 49–53, 61, 64, 66, 66, 66–67, 67, 67–70, 72, 74, 78
base_filter.class.ts	28.90%	31.82%	36.36%	26.17%	100–102, 102, 102–103, 112–116, 116, 116–117, 124–125, 125, 125–128, 143, 159, 169–174, 178, 181, 181, 181–184, 184, 184–185, 185, 188–189, 195, 204–205, 210–214, 257–260, 273, 273, 273–274, 276, 292–294, 294, 294, 294, 294–295, 297, 299–300, 306–307, 309–311, 315–316, 318, 322–324, 328, 332, 352, 352, 352–356, 393, 78, 78, 78–79, 79, 79–80, 80, 80–81, 86–89, 89, 89–90, 99

[ShaMan123]

READY

[ShaMan123]

@asturur what if we disable the lint action for now?
So we can see the green tick mark of all passing and then reinstate it in the end of the migration

[ShaMan123]

ready

[ShaMan123]

This is a cool thing instructing git to do a merge union in case of conflicts

[ShaMan123]

tested it in this PR when I ran update from master and indeed it fast forwarded and merged the file as expected

[ShaMan123]

Just resolved conflicts.
Github showed in the PR it had conflicts and in desktop just did the following:

GitHub.Desktop.2022-10-19.12-06-22_Trim.mp4

[github-actions]

Build Stats

file / KB (diff)	bundled	reduced*	minified	gzipped
fabric.min.js	1134 (0)		334 (0)	93 (0)

*inaccurate, see link

[asturur]

Why i don't see action starting here?