@gitkraken/conflict-tools 0.0.1-beta.8 → 0.0.1-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/CHANGELOG.md +2 -0
  2. package/README.md +4 -6
  3. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -6,3 +6,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/),
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/).
7
7
 
8
8
  ## [Unreleased]
9
+
10
+ - Initial release
package/README.md CHANGED
@@ -17,7 +17,7 @@ The library never calls `git` or an AI provider directly. Consumers supply adapt
17
17
  ## Install
18
18
 
19
19
  ```bash
20
- pnpm add @gitkraken/conflict-tools @gitkraken/shared-tools
20
+ pnpm add @gitkraken/conflict-tools
21
21
  ```
22
22
 
23
23
  ## Ports
@@ -36,8 +36,6 @@ const git: ConflictGitPort = {
36
36
 
37
37
  High-level ops the library dispatches through:
38
38
 
39
- | Op | Purpose |
40
- |---|---|
41
39
  | Op | Purpose |
42
40
  |---|---|
43
41
  | `readFile(path)` | Read working-tree file content (used during conflict extraction) |
@@ -285,7 +283,7 @@ Operation-level events (rebase started, step completed, etc.) are the consumer's
285
283
 
286
284
  | Error | Codes | When |
287
285
  |---|---|---|
288
- | `ConflictError` | `PARSE_FAILED`, `BINARY_CONFLICT` | Conflict extraction failed |
286
+ | `ConflictError` | `PARSE_FAILED` | Conflict extraction failed |
289
287
  | `AIError` | `VALIDATION_EXHAUSTED`, `INCOMPLETE_RESOLUTION` | Model could not produce a valid resolution after retries |
290
288
  | `ConflictGitPortMissingOpError` | — | A required git op is missing and no `exec` fallback was provided |
291
289
 
@@ -295,8 +293,8 @@ import { resolveConflict, AIError, ConflictError } from '@gitkraken/conflict-too
295
293
  try {
296
294
  await resolveConflict(conflict, context, { model, git });
297
295
  } catch (error) {
298
- if (error instanceof ConflictError && error.code === 'BINARY_CONFLICT') {
299
- // Binary file — apply your own fallback (take-ours, take-theirs, skip).
296
+ if (error instanceof ConflictError) {
297
+ // Conflict extraction failed (e.g. binary file or corrupt markers).
300
298
  } else if (error instanceof AIError) {
301
299
  // Model exhausted retries. Configure StepConfig.fallbackStrategy or handle here.
302
300
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gitkraken/conflict-tools",
3
- "version": "0.0.1-beta.8",
3
+ "version": "0.0.1-beta.9",
4
4
  "description": "AI-powered git conflict resolution.",
5
5
  "license": "SEE LICENSE IN LICENSE",
6
6
  "author": "Axosoft, LLC dba GitKraken",