weave-cli 0.6.1

Entity-level semantic merge CLI. Resolves conflicts at the function/class level instead of lines.
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

exit Some(1)
--- stdout
{
  "files": [
    {
      "advisories": [],
      "file": "app.py",
      "findings": [
        {
          "class": "MARKERS",
          "detail": "3 conflict marker line(s) still present",
          "suggestion": "the file is not resolved — every opening, separator and closing marker line must go, along with the refused_by: comment inside each box"
        }
      ],
      "ok": false,
      "verdict": "FOUND: app.py — 3 conflict marker line(s) still present"
    }
  ],
  "scope": "working tree vs the three merge stages of HEAD × MERGE_HEAD (base 88c8d8c4, merge in progress) — 1 file(s) either side changed"
}
--- stderr