weave-cli 0.7.0

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

exit Some(0)
--- stdout
app.py: 1 conflicted entity

function `a` — both_modified (F), refused_by: statement_fold
  1 contested hunk(s) (hunks BOTH sides wrote in; one-sided hunks are not conflicts and are not listed)
  [1] base lines 2-2 — ours modified (-1/+1), theirs modified (-1/+1)
      both rewrote:     return 1
      ours   +    return 10
      theirs +    return 11

run `weave check` after you edit to verify the resolution against these three stages.
--- stderr