workspace / project-alpha / ◈ Merge Resolver
Output
Problems
Terminal
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean
$ git log --oneline -5
a7f3b9c ◈ Merge branch 'feature/x' into main
c4d2e1f feat: implement ◈ graph resolver
8b9a0f3 fix: resolve merge conflicts in graph
d5e6f7a docs: update ◈ specification
1a2b3c4 chore: initial commit
Connected
◈ Merge Conflict: 0
Branch: main
1 Unresolved Thread
UTF-8