-
Notifications
You must be signed in to change notification settings - Fork 0
Pull requests: sulthonzh/git-conflicts
Author
Label
Projects
Milestones
Reviews
Assignee
Sort
Pull requests list
chore(deps): update dependency typescript to v7
#21
opened Aug 17, 2026 by
renovate
Bot
Loading…
1 task
chore(deps): update actions/setup-node action to v7
#19
opened Aug 17, 2026 by
renovate
Bot
Loading…
1 task
chore(deps): update dependency eslint to v10.8.1
#13
opened Aug 17, 2026 by
renovate
Bot
Loading…
1 task
fix: editor command parsing, comprehensive conflict markers, relative git-dir
#6
opened Jun 7, 2026 by
sulthonzh
Owner
Loading…
fix: path resolution, wasted git calls, parallel status
#5
opened Jun 3, 2026 by
sulthonzh
Owner
Loading…
fix: path resolution, wasted git call, getConflictStatus perf
#4
opened May 31, 2026 by
sulthonzh
Owner
Loading…
fix: abort handles rebase/cherry-pick/revert, rebase context, regex edge case
#3
opened May 31, 2026 by
sulthonzh
Owner
Loading…
fix: editor command splitting and merge conflict detection
#2
opened May 29, 2026 by
sulthonzh
Owner
Loading…
ProTip!
Exclude everything labeled
bug with -label:bug.