Commit f906d04
committed
fix(conflict): rebase conflict resolution onto exact MarketSquare main
Previous attempt manually incorporated upstream ESLint 10 changes but
GitHub's 3-way merge algorithm still detected conflicts in the three
files because the textual diffs overlapped.
This commit resolves the conflict properly by starting from the exact
MarketSquare main state for every file changed by the upstream
"bump eslint 9→10" + "renew NodeJs linting" commits, then layering
only our Electron additions on top:
- node/eslint.config.mjs: use upstream's exact content (no trailing newline)
- node/playwright-wrapper/playwright-state.ts: upstream lint-fixed + electron
- package-lock.json: upstream ESLint 10 packages + electron packages only
- package.json: upstream devDeps + electron ^35.0.0
- node/playwright-wrapper/grpc-service.ts: upstream + 3 electron RPC bindings
- .gitattributes, node/.prettierrc.js, node/build.wrapper.js,
node/playwright-wrapper/static/selector-finder.js, tasks.py:
adopted upstream verbatim (prettier reformatting, lint fixes)
ESLint 10 + mypy + robocop all pass clean.
https://claude.ai/code/session_011ivCRcjRk93AMkjLwsbquz1 parent 1ecfe43 commit f906d04
8 files changed
Lines changed: 2156 additions & 1013 deletions
File tree
- node
- playwright-wrapper/static
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
1 | 2 | | |
2 | 3 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
| 7 | + | |
7 | 8 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
| 55 | + | |
0 commit comments