-
+ {/* One panel child, so `.panel`'s two-row grid still sizes the
+ diff: the bar is an auto row inside this, not a third row
+ that would take the diff's. */}
+
@@ -1455,6 +1613,36 @@ const CommitDetails: FC<{
commitDetailsWithLineStatsQueryOptions({ projectId, commitId: selection.commitId }),
);
+ const { data: conflicts } = useQuery(
+ commitConflictsQueryOptions({
+ projectId,
+ commitId: selection.commitId,
+ enabled: commitDetails.commit.hasConflicts,
+ }),
+ );
+
+ // A commit's changes are diffed against its auto-resolution, which keeps the
+ // base's version wherever the merge conflicted — so a file whose conflict the
+ // auto-resolution swallows entirely is absent here and would diff to nothing.
+ // Append the base-vs-commit change the backend synthesises for exactly those,
+ // leaving files that already diff to something alone.
+ //
+ // Both arrays are memoised because their identity is load-bearing downstream:
+ // `filesRows` is keyed on `filesItems`, and `getDiffView` re-runs on a fresh
+ // `changes`.
+ const changes = useMemo(() => {
+ const swallowed = conflicts?.files.filter(
+ (file) => !commitDetails.changes.some((change) => change.path === file.path),
+ );
+ if (swallowed === undefined || swallowed.length === 0) return commitDetails.changes;
+ return [...commitDetails.changes, ...swallowed.map((file) => file.change)];
+ }, [commitDetails.changes, conflicts]);
+
+ const filesItems = useMemo(
+ () => getCommitFileRowItems({ commitDetails, manual: conflicts?.manual }),
+ [commitDetails, conflicts],
+ );
+
const fmtDate = new Intl.DateTimeFormat(undefined, {
day: "2-digit",
month: "2-digit",
@@ -1556,9 +1744,11 @@ const CommitDetails: FC<{
> = {
ciChecks: [],
commentReactions: [],
comments: ["gitActivity", "workspaceActivity", "worktreeChanges"],
+ // Derived from the trees the commit itself carries, so nothing outside it
+ // can change the answer. Resolving rewrites the commit, which moves the
+ // query to a new key rather than staling this one.
+ commitConflicts: [],
commitDetailsWithLineStats: ["gitActivity", "workspaceActivity"],
currentForgeLogin: [],
dryRun: ["gitActivity", "workspaceActivity", "worktreeChanges"],
diff --git a/crates/but-api/src/resolve/apply.rs b/crates/but-api/src/resolve/apply.rs
index fb5376ff8fd..4456b927e5f 100644
--- a/crates/but-api/src/resolve/apply.rs
+++ b/crates/but-api/src/resolve/apply.rs
@@ -31,7 +31,9 @@ pub(crate) struct AppliedResolution {
/// Whether the fully resolved commit ended up with the same tree as its
/// parent, i.e. the resolutions dropped all of its changes.
pub commit_emptied: bool,
- /// The conflicts that remain per file; empty when fully resolved.
+ /// The conflicts that remain per file; empty when every addressable
+ /// conflict is resolved. The commit can still be conflicted with `manual`
+ /// files even when this is empty.
pub remaining: Vec,
/// Workspace state after the apply.
pub workspace: WorkspaceState,
@@ -96,7 +98,23 @@ pub(crate) fn locate_hunk(
) -> anyhow::Result<(usize, usize)> {
let &file_index = files_by_path
.get(&normalize_path(path))
- .with_context(|| format!("\"{path}\" is not a conflicted file of this commit"))?;
+ .with_context(|| {
+ // Naming the reason matters here: the file *is* conflicted, it just
+ // has no hunks to address, so "not a conflicted file" would read as
+ // a caller mistake rather than a property of the conflict.
+ let normalized = normalize_path(path);
+ match request
+ .manual
+ .iter()
+ .find(|file| normalize_path(&file.path) == normalized)
+ {
+ Some(file) => format!(
+ "\"{path}\" cannot be resolved this way: {} Resolve this commit in edit mode instead.",
+ file.reason
+ ),
+ None => format!("\"{path}\" is not a conflicted file of this commit"),
+ }
+ })?;
let file = &request.files[file_index];
if hunk == 0 || hunk > file.hunks.len() {
bail!(
@@ -335,7 +353,9 @@ pub(crate) fn apply(
})
})
.collect();
- if unresolved && remaining.is_empty() {
+ // Only holds when every conflict was hunk-addressable: a file in `manual`
+ // is never narrowed, so it keeps conflicting however many hunks were resolved.
+ if unresolved && remaining.is_empty() && request.manual.is_empty() {
bail!(
"BUG: all conflicts of commit {} were resolved, yet re-merging the narrowed trees still conflicts",
request.commit_id
@@ -524,6 +544,7 @@ mod tests {
ours_tree_id: gix::ObjectId::null(gix::hash::Kind::Sha1),
theirs_tree_id: gix::ObjectId::null(gix::hash::Kind::Sha1),
files,
+ manual: Vec::new(),
}
}
diff --git a/crates/but-api/src/resolve/context.rs b/crates/but-api/src/resolve/context.rs
index f2f66259117..92645516b5d 100644
--- a/crates/but-api/src/resolve/context.rs
+++ b/crates/but-api/src/resolve/context.rs
@@ -87,15 +87,35 @@ pub struct ResolutionRequest {
pub ours_tree_id: gix::ObjectId,
/// The commit's stored *theirs* tree, i.e. its own version.
pub theirs_tree_id: gix::ObjectId,
- /// All conflicted files, sorted by path.
+ /// All conflicted files that decompose into hunks, sorted by path.
pub files: Vec,
+ /// Conflicted files that have no hunk representation, sorted by path.
+ /// They cannot be addressed through this API at all, so a commit is only
+ /// fully resolved once this is empty.
+ pub manual: Vec,
}
+/// A conflicted file with no hunk representation — a side deletion or rename, a
+/// non-blob entry, a binary, or one too large to splice — which therefore needs
+/// manual resolution in edit mode.
+#[derive(Debug, Clone, serde::Serialize)]
+#[cfg_attr(feature = "export-schema", derive(schemars::JsonSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct ManualConflict {
+ /// The repo-relative path of the file.
+ pub path: String,
+ /// Why it cannot be resolved automatically, for display to the user.
+ pub reason: String,
+}
+
+#[cfg(feature = "export-schema")]
+but_schemars::register_sdk_type!(ManualConflict);
+
/// Re-merge the conflict trees of `commit_id` and extract all conflict hunks.
///
-/// Fails with a "resolve manually" style error for conflicts that have no
-/// marker block to splice a resolution into: side deletions, non-blob entries,
-/// binary or oversized files.
+/// Conflicts with no marker block to splice a resolution into — side deletions,
+/// non-blob entries, binary or oversized files — are reported in `manual`
+/// rather than failing the request, so the rest of the commit stays workable.
pub fn build_request(
repo: &gix::Repository,
commit_id: gix::ObjectId,
@@ -160,12 +180,24 @@ pub fn build_request(
let merged_tree = repo.find_tree(merged_tree_id)?;
let mut files = Vec::with_capacity(sides_by_path.len());
+ let mut manual = Vec::new();
+ // A file with no hunk representation is reported rather than failing the
+ // whole commit: the conflicts that *can* be addressed stay addressable, and
+ // the commit simply remains conflicted until this one is resolved in edit
+ // mode. Failing outright would hide every other conflict behind one binary.
+ macro_rules! needs_manual_resolution {
+ ($path:expr, $reason:expr) => {{
+ manual.push(ManualConflict {
+ path: $path,
+ reason: $reason,
+ });
+ continue;
+ }};
+ }
for (rela_path, sides) in sides_by_path {
let path = rela_path.to_str_lossy().into_owned();
if !(sides.ours && sides.theirs) {
- bail!(
- "The conflict in \"{path}\" involves a deletion or rename and cannot be resolved automatically. Resolve this commit manually instead."
- );
+ needs_manual_resolution!(path, "The conflict involves a deletion or rename.".into());
}
let entry = merged_tree
.lookup_entry(rela_path.split(|b| *b == b'/'))?
@@ -177,23 +209,16 @@ pub fn build_request(
entry_kind,
gix::objs::tree::EntryKind::Blob | gix::objs::tree::EntryKind::BlobExecutable
) {
- bail!(
- "The conflict in \"{path}\" is not a regular file and cannot be resolved automatically. Resolve this commit manually instead."
- );
+ needs_manual_resolution!(path, "The conflict is not a regular file.".into());
}
let blob = entry.object()?.into_blob();
if blob.data.len() > MAX_FILE_SIZE {
- bail!(
- "The conflicted file \"{path}\" exceeds the 1MB size limit for automatic resolution. Resolve this commit manually instead."
- );
+ needs_manual_resolution!(path, "The file exceeds the 1MB size limit.".into());
}
- let merged_text = std::str::from_utf8(&blob.data)
- .map_err(|_| {
- anyhow::anyhow!(
- "The conflicted file \"{path}\" is binary or not valid UTF-8 and cannot be resolved automatically. Resolve this commit manually instead."
- )
- })?
- .to_owned();
+ let Ok(merged_text) = std::str::from_utf8(&blob.data) else {
+ needs_manual_resolution!(path, "The file is binary or not valid UTF-8.".into());
+ };
+ let merged_text = merged_text.to_owned();
let lines = split_lines(&merged_text);
let blocks = scan_conflict_blocks(&lines);
// Content that merely looks like a conflict marker cannot open or
@@ -201,14 +226,13 @@ pub fn build_request(
// would confuse the section decomposition or any later marker-based
// reader of the resolved file, so hand such files to manual resolution.
if let Some(line) = find_ambiguous_marker_line(&lines, &blocks) {
- bail!(
- "The conflicted file \"{path}\" contains content that is ambiguous with conflict markers ({line:?}) and cannot be resolved automatically. Resolve this commit manually instead."
+ needs_manual_resolution!(
+ path,
+ format!("The file contains content ambiguous with conflict markers ({line:?}).")
);
}
if blocks.is_empty() {
- bail!(
- "No conflict markers were found in the conflicted file \"{path}\". Resolve this commit manually instead."
- );
+ needs_manual_resolution!(path, "No conflict markers were found in the file.".into());
}
let hunks = extract_hunks(&lines, &blocks);
files.push(FileConflict {
@@ -220,7 +244,7 @@ pub fn build_request(
});
}
- if files.is_empty() {
+ if files.is_empty() && manual.is_empty() {
bail!("Commit {commit_id} has no conflicted files to resolve");
}
@@ -232,6 +256,7 @@ pub fn build_request(
ours_tree_id: ours,
theirs_tree_id: theirs,
files,
+ manual,
})
}
diff --git a/crates/but-api/src/resolve/mod.rs b/crates/but-api/src/resolve/mod.rs
index 126f6090450..ca62353a8fe 100644
--- a/crates/but-api/src/resolve/mod.rs
+++ b/crates/but-api/src/resolve/mod.rs
@@ -34,7 +34,7 @@ mod context;
mod prompt;
pub use apply::normalize_path;
-pub use context::{ConflictHunk, FileConflict, ResolutionRequest};
+pub use context::{ConflictHunk, FileConflict, ManualConflict, ResolutionRequest};
pub use prompt::{FileResolution, HunkContent, ResolutionResponse, SYSTEM_PROMPT};
/// The conflicts of a conflicted commit, as per-file hunks.
@@ -42,8 +42,12 @@ pub use prompt::{FileResolution, HunkContent, ResolutionResponse, SYSTEM_PROMPT}
pub struct CommitConflicts {
/// The conflicted commit.
pub commit_id: gix::ObjectId,
- /// The conflicted files, sorted by path.
+ /// The conflicted files that decompose into hunks, sorted by path.
pub files: Vec,
+ /// Conflicted files that have no hunk representation and so cannot be
+ /// resolved through this API at all. They need edit mode, and the commit
+ /// stays conflicted until they are dealt with there.
+ pub manual: Vec,
}
/// One conflicted file and its conflicts, in file order.
@@ -76,7 +80,7 @@ but_schemars::register_sdk_type!(ConflictedFile);
/// result. Fails for commits whose conflicts have no hunk representation
/// (deletions/renames, binaries, oversized files, marker-like content) — those
/// need manual resolution in edit mode.
-#[but_api(try_from = crate::resolve::json::CommitConflicts)]
+#[but_api(napi, try_from = crate::resolve::json::CommitConflicts)]
#[instrument(err(Debug))]
pub fn commit_conflicts(
ctx: &but_ctx::Context,
@@ -93,6 +97,7 @@ pub fn commit_conflicts(
return Ok(CommitConflicts {
commit_id,
files: Vec::new(),
+ manual: Vec::new(),
});
}
let request = context::build_request(&repo, commit_id)?;
@@ -131,6 +136,7 @@ pub fn commit_conflicts(
Ok(CommitConflicts {
commit_id: request.commit_id,
files,
+ manual: request.manual,
})
}
@@ -213,9 +219,13 @@ pub struct HunkResolutionResult {
/// Whether the fully resolved commit ended up with the same tree as its
/// parent — the resolutions dropped all of its changes.
pub commit_emptied: bool,
- /// The conflicts that remain, per file. Empty when the commit is fully
- /// resolved.
+ /// The conflicts that remain, per file. Empty when every hunk-addressable
+ /// conflict is resolved.
pub remaining: Vec,
+ /// Conflicted files this API cannot address at all. The commit stays
+ /// conflicted while this is non-empty, however many hunks were resolved,
+ /// so a caller reporting "fully resolved" must check both lists.
+ pub manual: Vec,
/// Workspace state after the apply.
pub workspace: WorkspaceState,
}
@@ -231,7 +241,7 @@ pub struct HunkResolutionResult {
/// [`HunkResolution::Ai`] specs are sent to the configured LLM first (no
/// worktree lock is held during the model call); AI configuration is only
/// required when such a spec is present.
-#[but_api(try_from = crate::resolve::json::HunkResolutionResult)]
+#[but_api(napi, try_from = crate::resolve::json::HunkResolutionResult)]
#[instrument(skip(specs), err(Debug))]
pub fn resolve_commit_conflict_hunks(
ctx: &mut but_ctx::Context,
@@ -308,6 +318,7 @@ pub fn resolve_commit_conflict_hunks_with(
resolved,
commit_emptied: applied.commit_emptied,
remaining: applied.remaining,
+ manual: request.manual,
workspace: applied.workspace,
})
}
@@ -349,6 +360,8 @@ fn resolve_ai_specs(
base_tree_id: request.base_tree_id,
ours_tree_id: request.ours_tree_id,
theirs_tree_id: request.theirs_tree_id,
+ // The model only ever sees the hunks it was asked to merge.
+ manual: Vec::new(),
files: targets_per_file
.iter()
.map(|(&file_index, targets)| {
@@ -476,6 +489,17 @@ pub fn resolve_commit_conflicts_with(
let repo = ctx.repo.get()?;
context::build_request(&repo, commit_id)?
};
+ // This path promises a fully resolved commit, so a file the model cannot be
+ // shown is a hard stop rather than something to leave behind — unlike
+ // `resolve_commit_conflict_hunks()`, which resolves what it is asked to and
+ // leaves the rest conflicted by design.
+ if let Some(file) = request.manual.first() {
+ bail!(
+ "The conflict in \"{}\" cannot be resolved automatically: {} Resolve this commit in edit mode instead.",
+ file.path,
+ file.reason
+ );
+ }
// The model call happens without any worktree lock; the request is plain
// data and the apply step below re-reads the workspace under the exclusive
@@ -624,8 +648,10 @@ pub mod json {
/// The conflicted commit.
#[cfg_attr(feature = "export-schema", schemars(with = "String"))]
pub commit_id: HexHash,
- /// The conflicted files, sorted by path.
+ /// The conflicted files that decompose into hunks, sorted by path.
pub files: Vec,
+ /// Conflicted files that need manual resolution in edit mode.
+ pub manual: Vec,
}
#[cfg(feature = "export-schema")]
@@ -635,10 +661,15 @@ pub mod json {
type Error = anyhow::Error;
fn try_from(value: super::CommitConflicts) -> Result {
- let super::CommitConflicts { commit_id, files } = value;
+ let super::CommitConflicts {
+ commit_id,
+ files,
+ manual,
+ } = value;
Ok(Self {
commit_id: commit_id.into(),
files,
+ manual,
})
}
}
@@ -661,6 +692,8 @@ pub mod json {
pub commit_emptied: bool,
/// The conflicts that remain, per file.
pub remaining: Vec,
+ /// Conflicted files that need manual resolution in edit mode.
+ pub manual: Vec,
/// Workspace state after the apply.
pub workspace: crate::json::WorkspaceState,
}
@@ -678,6 +711,7 @@ pub mod json {
resolved,
commit_emptied,
remaining,
+ manual,
workspace,
} = value;
Ok(Self {
@@ -686,6 +720,7 @@ pub mod json {
resolved,
commit_emptied,
remaining,
+ manual,
workspace: workspace.try_into()?,
})
}
diff --git a/crates/but-api/tests/api/resolve_hunks.rs b/crates/but-api/tests/api/resolve_hunks.rs
index 996423bf2e2..50aaba244de 100644
--- a/crates/but-api/tests/api/resolve_hunks.rs
+++ b/crates/but-api/tests/api/resolve_hunks.rs
@@ -9,7 +9,7 @@ fn conflicted_context() -> Result<(but_ctx::Context, gix::ObjectId, tempfile::Te
let (repo, tmp) = crate::support::writable_scenario("resolve-ai-conflicted-commit");
crate::support::persist_default_target(&repo)?;
let conflicted_commit = repo.rev_parse_single("refs/tags/conflicted")?.detach();
- let ctx = but_ctx::Context::from_repo(repo)?.with_memory_app_cache();
+ let ctx = but_ctx::Context::from_repo_for_testing(repo)?.with_memory_app_cache();
Ok((ctx, conflicted_commit, tmp))
}
@@ -318,3 +318,97 @@ fn conflicts_of_a_normal_commit_are_empty_not_an_error() -> Result<()> {
assert!(conflicts.files.is_empty());
Ok(())
}
+
+fn mixed_conflicted_context() -> Result<(but_ctx::Context, gix::ObjectId, tempfile::TempDir)> {
+ let (repo, tmp) = crate::support::writable_scenario("resolve-mixed-conflicted-commit");
+ crate::support::persist_default_target(&repo)?;
+ let conflicted_commit = repo.rev_parse_single("refs/tags/conflicted")?.detach();
+ let ctx = but_ctx::Context::from_repo_for_testing(repo)?.with_memory_app_cache();
+ Ok((ctx, conflicted_commit, tmp))
+}
+
+/// A conflict with no hunk representation used to fail the whole request, which
+/// hid every other conflict in the commit behind it — and left a caller with no
+/// edit mode, like lite, with nothing at all to show.
+#[test]
+fn a_conflict_without_hunks_is_reported_not_fatal() -> Result<()> {
+ let (ctx, conflicted_commit, _tmp) = mixed_conflicted_context()?;
+
+ let conflicts = commit_conflicts(&ctx, conflicted_commit)?;
+
+ // The text conflict is still fully addressable.
+ assert_eq!(
+ conflicts.files.len(),
+ 1,
+ "the binary must not suppress the file that does decompose into hunks"
+ );
+ assert_eq!(conflicts.files[0].path, "conflict");
+ assert_eq!(conflicts.files[0].hunks.len(), 2);
+
+ // The binary is named, with a reason to show the user.
+ assert_eq!(conflicts.manual.len(), 1);
+ assert_eq!(conflicts.manual[0].path, "binary");
+ assert!(
+ conflicts.manual[0].reason.contains("binary"),
+ "reason should say why, got {:?}",
+ conflicts.manual[0].reason
+ );
+ Ok(())
+}
+
+/// Resolving every addressable hunk still leaves the commit conflicted when a
+/// manual-only file remains, so the result must say so rather than reporting a
+/// clean commit — and must not trip the "all resolved yet still conflicting"
+/// invariant, which only holds when every conflict was addressable.
+#[test]
+fn resolving_every_hunk_leaves_a_manual_conflict_behind() -> Result<()> {
+ let (mut ctx, conflicted_commit, _tmp) = mixed_conflicted_context()?;
+
+ let result = resolve_commit_conflict_hunks(
+ &mut ctx,
+ conflicted_commit,
+ vec![
+ spec("conflict", 1, HunkResolution::Theirs),
+ spec("conflict", 2, HunkResolution::Theirs),
+ ],
+ )?;
+
+ assert_eq!(result.resolved, 2);
+ assert!(
+ result.remaining.is_empty(),
+ "every hunk-addressable conflict was resolved"
+ );
+ assert_eq!(
+ result.manual.len(),
+ 1,
+ "the binary is still unresolved, so the commit is not done"
+ );
+
+ let repo = ctx.repo.get()?;
+ assert!(
+ but_core::Commit::from_id(result.new_commit.attach(&repo))?.is_conflicted(),
+ "a commit with a manual conflict left stays conflicted"
+ );
+ Ok(())
+}
+
+/// Addressing a file that has no hunks should explain why rather than claim the
+/// path is not conflicted at all, which reads as a caller mistake.
+#[test]
+fn addressing_a_manual_conflict_explains_why() -> Result<()> {
+ let (mut ctx, conflicted_commit, _tmp) = mixed_conflicted_context()?;
+
+ let err = resolve_commit_conflict_hunks(
+ &mut ctx,
+ conflicted_commit,
+ vec![spec("binary", 1, HunkResolution::Ours)],
+ )
+ .unwrap_err();
+
+ let message = format!("{err:#}");
+ assert!(
+ message.contains("binary") && message.contains("edit mode"),
+ "error should name the reason and the way out, got {message:?}"
+ );
+ Ok(())
+}
diff --git a/crates/but-api/tests/fixtures/scenario/resolve-mixed-conflicted-commit.sh b/crates/but-api/tests/fixtures/scenario/resolve-mixed-conflicted-commit.sh
new file mode 100755
index 00000000000..50277dd4418
--- /dev/null
+++ b/crates/but-api/tests/fixtures/scenario/resolve-mixed-conflicted-commit.sh
@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+git init
+echo "A conflicted commit mixing a hunk-addressable conflict with a binary one" >.git/description
+
+git config user.name GitButler
+git config user.email gitbutler@example.com
+
+echo unrelated >file
+git add . && git commit -m "init"
+
+mkdir -p .git/refs/remotes/origin
+cp .git/refs/heads/main .git/refs/remotes/origin/main
+
+cat <>.git/config
+[remote "origin"]
+ url = ./fake/local/path/which-is-fine-as-we-dont-fetch-or-push
+ fetch = +refs/heads/*:refs/remotes/origin/*
+EOF
+
+# A conflicted commit as GitButler would write it after a rebase: the merge
+# inputs are kept as trees, the commit tree is auto-resolved favoring "ours",
+# and the conflict is recorded in the message trailer plus the legacy header.
+#
+# The content conflicts: base, ours (the new base), and theirs (the commit's
+# own version) each differ at "line two" and at "line six" of "conflict",
+# far enough apart to form two separate conflict hunks.
+unrelated_blob=$(git rev-parse HEAD:file)
+base_blob=$(printf "line one\nline two\nline three\nline four\nline five\nline six\nline seven\n" | git hash-object -wt blob --stdin)
+ours_blob=$(printf "line one\nline two changed by the new base\nline three\nline four\nline five\nline six changed by the new base\nline seven\n" | git hash-object -wt blob --stdin)
+theirs_blob=$(printf "line one\nline two changed by this commit\nline three\nline four\nline five\nline six changed by this commit\nline seven\n" | git hash-object -wt blob --stdin)
+# A binary file conflicting on both sides too. It has no marker representation,
+# so it can only ever be resolved in edit mode — the point of the fixture is
+# that its presence must not hide the text conflicts above.
+base_bin=$(printf 'bin\xff\xfe base\n' | git hash-object -wt blob --stdin)
+ours_bin=$(printf 'bin\xff\xfe ours\n' | git hash-object -wt blob --stdin)
+theirs_bin=$(printf 'bin\xff\xfe theirs\n' | git hash-object -wt blob --stdin)
+
+conflict_files_blob=$(git hash-object -wt blob --stdin < 1730625617 +0100
+committer GitButler 1730625617 +0100
+gitbutler-headers-version 2
+change-id 00000000-0000-0000-0000-000000000001
+gitbutler-conflicted 1
+
+[conflict] Change line two
+
+GitButler-Conflict: fixture marker
+
+EOF
+)
+git tag conflicted "$conflict_commit"
+
+# A normal descendant of the conflicted commit. Its tree is built on the
+# conflicted commit's auto-resolution, like the rebase engine would do.
+later_blob=$(printf "descendant\n" | git hash-object -wt blob --stdin)
+git read-tree --empty
+git update-index --add --cacheinfo 100644 "$unrelated_blob" "file"
+git update-index --add --cacheinfo 100644 "$ours_blob" "conflict"
+git update-index --add --cacheinfo 100644 "$ours_bin" "binary"
+git update-index --add --cacheinfo 100644 "$later_blob" "later"
+descendant_tree=$(git write-tree)
+descendant_commit=$(git commit-tree "$descendant_tree" -p "$conflict_commit" -m "descendant")
+git update-ref refs/heads/branchy "$descendant_commit"
+
+git symbolic-ref HEAD refs/heads/branchy
+git reset --hard >/dev/null
diff --git a/crates/but/src/command/legacy/resolve.rs b/crates/but/src/command/legacy/resolve.rs
index f3d4642c26c..8b1800aaca6 100644
--- a/crates/but/src/command/legacy/resolve.rs
+++ b/crates/but/src/command/legacy/resolve.rs
@@ -637,14 +637,14 @@ enum CommitOrBranch {
/// Resolve a user-provided identifier to a commit or a branch.
fn parse_commit_or_branch(ctx: &mut Context, target: &str) -> Result {
- let id_map = IdMap::legacy_new_from_context(ctx, None)?;
+ let id_map = IdMap::legacy_new_from_context(ctx)?;
let matches = id_map.parse_using_context(target, ctx)?;
match matches.as_slice() {
[] => bail!(
"\"{target}\" is neither a commit nor a branch. Try running 'but status' to see what is available."
),
- [CliId::Commit { commit_id, .. }] => Ok(CommitOrBranch::Commit(*commit_id)),
- [CliId::Branch { name, .. }] => Ok(CommitOrBranch::Branch(name.clone())),
+ [CliId::Commit { commit, .. }] => Ok(CommitOrBranch::Commit(commit.commit_id)),
+ [CliId::Branch(branch)] => Ok(CommitOrBranch::Branch(branch.name.clone())),
[_] => bail!("\"{target}\" does not refer to a commit or a branch"),
_ => bail!(
"\"{target}\" is ambiguous. Please provide more characters to uniquely identify it."
diff --git a/packages/but-sdk/src/generated/graph/apiParamNames.d.ts b/packages/but-sdk/src/generated/graph/apiParamNames.d.ts
index 8dd9face820..808f799e587 100644
--- a/packages/but-sdk/src/generated/graph/apiParamNames.d.ts
+++ b/packages/but-sdk/src/generated/graph/apiParamNames.d.ts
@@ -29,6 +29,7 @@ export declare const apiParamNames: {
readonly commentsList: readonly ["projectId"];
readonly commitAmend: readonly ["projectId", "commitId", "changes", "changesSource", "dryRun"];
readonly commitCherryPick: readonly ["projectId", "sourceCommitIds", "relativeTo", "side", "dryRun"];
+ readonly commitConflicts: readonly ["projectId", "commitId"];
readonly commitCreate: readonly ["projectId", "relativeTo", "side", "changes", "changesSource", "message", "dryRun"];
readonly commitDetailsWithLineStats: readonly ["projectId", "commitId"];
readonly commitDiscard: readonly ["projectId", "subjectCommitId", "dryRun"];
@@ -104,6 +105,7 @@ export declare const apiParamNames: {
readonly removeReviewLabel: readonly ["projectId", "reviewId", "label"];
readonly removeReviewReaction: readonly ["projectId", "reviewId", "reactionId"];
readonly requestReview: readonly ["projectId", "reviewId", "logins"];
+ readonly resolveCommitConflictHunks: readonly ["projectId", "commitId", "specs"];
readonly restoreSnapshotWithKind: readonly ["projectId", "restoreKind", "sha"];
readonly reviewApply: readonly ["projectId", "reviewId"];
readonly reviewTemplate: readonly ["projectId"];
diff --git a/packages/but-sdk/src/generated/graph/apiParamNames.js b/packages/but-sdk/src/generated/graph/apiParamNames.js
index 36ec8cc4e83..6a077431740 100644
--- a/packages/but-sdk/src/generated/graph/apiParamNames.js
+++ b/packages/but-sdk/src/generated/graph/apiParamNames.js
@@ -29,6 +29,7 @@ export const apiParamNames = {
commentsList: ["projectId"],
commitAmend: ["projectId", "commitId", "changes", "changesSource", "dryRun"],
commitCherryPick: ["projectId", "sourceCommitIds", "relativeTo", "side", "dryRun"],
+ commitConflicts: ["projectId", "commitId"],
commitCreate: ["projectId", "relativeTo", "side", "changes", "changesSource", "message", "dryRun"],
commitDetailsWithLineStats: ["projectId", "commitId"],
commitDiscard: ["projectId", "subjectCommitId", "dryRun"],
@@ -104,6 +105,7 @@ export const apiParamNames = {
removeReviewLabel: ["projectId", "reviewId", "label"],
removeReviewReaction: ["projectId", "reviewId", "reactionId"],
requestReview: ["projectId", "reviewId", "logins"],
+ resolveCommitConflictHunks: ["projectId", "commitId", "specs"],
restoreSnapshotWithKind: ["projectId", "restoreKind", "sha"],
reviewApply: ["projectId", "reviewId"],
reviewTemplate: ["projectId"],
diff --git a/packages/but-sdk/src/generated/graph/index.d.ts b/packages/but-sdk/src/generated/graph/index.d.ts
index eb6480464a1..d9ccd8d3cf4 100644
--- a/packages/but-sdk/src/generated/graph/index.d.ts
+++ b/packages/but-sdk/src/generated/graph/index.d.ts
@@ -263,6 +263,19 @@ export declare function commitAmend(projectId: string, commitId: string, changes
*/
export declare function commitCherryPick(projectId: string, sourceCommitIds: Array, relativeTo: RelativeTo, side: InsertSide, dryRun: boolean): Promise
+/**
+ * Return the conflicts of the conflicted commit `commit_id` without entering
+ * edit mode or touching the working tree.
+ *
+ * Hunks are identified by `(path, 1-based index)`; the extraction is
+ * deterministic, so the same commit id always yields the same hunks and
+ * `resolve_commit_conflict_hunks()` can be called with indices from this
+ * result. Fails for commits whose conflicts have no hunk representation
+ * (deletions/renames, binaries, oversized files, marker-like content) — those
+ * need manual resolution in edit mode.
+ */
+export declare function commitConflicts(projectId: string, commitId: string): Promise
+
/**
* Insert a new commit built from the `changes` of `changes_source` and record
* an oplog snapshot on success.
@@ -846,6 +859,21 @@ export declare function removeReviewReaction(projectId: string, reviewId: number
/** Request reviews from the given users on a review. */
export declare function requestReview(projectId: string, reviewId: number, logins: Array): Promise
+/**
+ * Apply `specs` to the conflicted commit `commit_id` and rebase descendants.
+ *
+ * Resolving a subset of the conflicts rewrites the commit into a conflicted
+ * commit with only the remaining conflicts; resolving all of them rewrites it
+ * into a normal commit. Either way the commit id changes — address follow-up
+ * resolutions to the returned `new_commit`. An oplog snapshot records an undo
+ * point. Nothing is written if any spec fails validation.
+ *
+ * [`HunkResolution::Ai`] specs are sent to the configured LLM first (no
+ * worktree lock is held during the model call); AI configuration is only
+ * required when such a spec is present.
+ */
+export declare function resolveCommitConflictHunks(projectId: string, commitId: string, specs: Array): Promise
+
/**
* Restores the project to a specific snapshot using a specific kind of restore. This operation
* also creates a new snapshot in the oplog.
@@ -1799,6 +1827,16 @@ export type CommitCherryPickResult = {
workspace: WorkspaceState;
};
+/** JSON transport type for the conflicts of a conflicted commit. */
+export type CommitConflicts = {
+ /** The conflicted commit. */
+ commitId: string;
+ /** The conflicted files that decompose into hunks, sorted by path. */
+ files: Array;
+ /** Conflicted files that need manual resolution in edit mode. */
+ manual: Array;
+};
+
/** JSON transport type for creating a commit in the rebase graph. */
export type CommitCreateResult = {
/** The new commit if one was created. */
@@ -2717,6 +2755,8 @@ export type HunkResolutionResult = {
commitEmptied: boolean;
/** The conflicts that remain, per file. */
remaining: Array;
+ /** Conflicted files that need manual resolution in edit mode. */
+ manual: Array;
/** Workspace state after the apply. */
workspace: WorkspaceState;
};
@@ -2951,6 +2991,18 @@ export type LoginToken = {
url: string;
};
+/**
+ * A conflicted file with no hunk representation — a side deletion or rename, a
+ * non-blob entry, a binary, or one too large to splice — which therefore needs
+ * manual resolution in edit mode.
+ */
+export type ManualConflict = {
+ /** The repo-relative path of the file. */
+ path: string;
+ /** Why it cannot be resolved automatically, for display to the user. */
+ reason: string;
+};
+
/**
* An optional full reference name accepted as a string like `refs/heads/main`,
* for use as a parameter transport via `#[but_api(...)]`.
@@ -3284,6 +3336,19 @@ export type RepoPermissions = {
pull: boolean;
};
+/**
+ * One conflict to resolve, addressed by path and 1-based hunk index as
+ * returned by `commit_conflicts()`.
+ */
+export type ResolutionSpec = {
+ /** The repo-relative path of the conflicted file. */
+ path: string;
+ /** The 1-based index of the conflict within the file. */
+ hunk: number;
+ /** How to resolve it. */
+ resolution: HunkResolution;
+};
+
/** How one conflicted file was resolved, for display to the user. */
export type ResolvedFile = {
/** The repo-relative path of the file. */
diff --git a/packages/but-sdk/src/generated/graph/index.js b/packages/but-sdk/src/generated/graph/index.js
index 791a6987bfd..1530a4094f4 100644
--- a/packages/but-sdk/src/generated/graph/index.js
+++ b/packages/but-sdk/src/generated/graph/index.js
@@ -579,7 +579,7 @@ if (!nativeBinding) {
throw new Error(`Failed to load native binding`)
}
-const { absorb, absorptionPlan, addCommentReaction, addReviewLabels, addReviewReaction, apply, applyBranchIntegration, assignHunk, branchCannedName, branchCheckout, branchCheckoutNew, branchCreate, branchDetails, branchDiff, branchLand, branchList, branchRemove, branchRename, changesInWorktree, changesInWorktreeWithPerm, checkGithubAuthStatus, checkSigningSettings, commentArchive, commentCreate, commentsList, commentUpdate, commitAmend, commitCherryPick, commitCreate, commitDetailsWithLineStats, commitDiscard, commitDiscardChanges, commitInsertBlank, commitMove, commitMoveChangesBetween, commitReword, commitSquash, commitUncommit, commitUncommitChanges, commitUncommitChangesFromCommits, createReviewComment, currentForgeLogin, deleteAllData, deleteProject, deleteReviewComment, deleteUser, discardWorktreeChanges, forgeCompareBranchUrl, forgeInfo, forgeProvider, forgetBitbucketAccount, forgetGithubAccount, forgetGitlabAccount, getBbUser, getGbConfig, getGhUser, getGlUser, getInitialBranchIntegration, getLoginToken, getRedoTargetSnapshot, getRepoInfo, getReview, getReviewBaseRepoUrl, getReviewMergeStatus, getTerminalOptionsForPlatform, getUndoTargetSnapshot, getUserProfileLocal, getWorkspace, gitTestFetch, gitTestPush, headInfo, initApplicationNamespace, initGithubDeviceOauth, listAvailableReviewTemplates, listBranches, listCiChecks, listCommentReactions, listEditors, listKnownBitbucketAccounts, listKnownGithubAccounts, listKnownGitlabAccounts, listPrograms, listProjectsStateless, listRepoLabels, listReviewComments, listReviewerCandidates, listReviewReactions, listReviews, listReviewsForBranch, listReviewSubmissions, listReviewTimelineEvents, loginAndPersist, mergeReview, moveBranch, openInProgram, openInTerminal, peelRestoreSnapshot, ProgramCategory, publishReview, removeBranch, removeCommentReaction, removeReviewLabel, removeReviewReaction, requestReview, restoreSnapshotWithKind, reviewApply, reviewTemplate, setGbConfig, setPushRemote, setReviewAutoMerge, setReviewDraftiness, setReviewTemplate, setTargetRefAndInitProject, storeBitbucketApiToken, storeGithubPat, storeGitlabPat, tearOffBranch, treeChangeDiffs, unapplyStack, updateBranchName, updateProfileAndPersist, updateProjectSettings, updateReview, updateReviewComment, updateReviewFooters, warmCiChecksCache, withdrawReviewRequest, workspaceBranchAndAncestorsPush, workspaceCheckout, workspaceFetchFromRemotes, workspaceFetchStatus, workspaceIntegrateUpstream, workspaceTargetCommits, WatcherHandle, ANY_FORK, ANY_FORK_OR_MERGE, ANY_MERGE, askpassInit, askpassSubmitPromptResponse, CHILD, getAppSettings, HORIZ_ANCESTOR, HORIZ_PARENT, HORIZONTAL, LEFT_FORK, LEFT_FORK_ANCESTOR, LEFT_FORK_PARENT, LEFT_MERGE, LEFT_MERGE_ANCESTOR, LEFT_MERGE_PARENT, RIGHT_FORK, RIGHT_FORK_ANCESTOR, RIGHT_FORK_PARENT, RIGHT_MERGE, RIGHT_MERGE_ANCESTOR, RIGHT_MERGE_PARENT, updateFeatureFlags, updateFetch, updateOnboardingComplete, updateReviews, updateTelemetry, updateTelemetryDistinctId, updateUi, VERT_ANCESTOR, VERT_PARENT, VERTICAL, watcherStart } = nativeBinding
+const { absorb, absorptionPlan, addCommentReaction, addReviewLabels, addReviewReaction, apply, applyBranchIntegration, assignHunk, branchCannedName, branchCheckout, branchCheckoutNew, branchCreate, branchDetails, branchDiff, branchLand, branchList, branchRemove, branchRename, changesInWorktree, changesInWorktreeWithPerm, checkGithubAuthStatus, checkSigningSettings, commentArchive, commentCreate, commentsList, commentUpdate, commitAmend, commitCherryPick, commitConflicts, commitCreate, commitDetailsWithLineStats, commitDiscard, commitDiscardChanges, commitInsertBlank, commitMove, commitMoveChangesBetween, commitReword, commitSquash, commitUncommit, commitUncommitChanges, commitUncommitChangesFromCommits, createReviewComment, currentForgeLogin, deleteAllData, deleteProject, deleteReviewComment, deleteUser, discardWorktreeChanges, forgeCompareBranchUrl, forgeInfo, forgeProvider, forgetBitbucketAccount, forgetGithubAccount, forgetGitlabAccount, getBbUser, getGbConfig, getGhUser, getGlUser, getInitialBranchIntegration, getLoginToken, getRedoTargetSnapshot, getRepoInfo, getReview, getReviewBaseRepoUrl, getReviewMergeStatus, getTerminalOptionsForPlatform, getUndoTargetSnapshot, getUserProfileLocal, getWorkspace, gitTestFetch, gitTestPush, headInfo, initApplicationNamespace, initGithubDeviceOauth, listAvailableReviewTemplates, listBranches, listCiChecks, listCommentReactions, listEditors, listKnownBitbucketAccounts, listKnownGithubAccounts, listKnownGitlabAccounts, listPrograms, listProjectsStateless, listRepoLabels, listReviewComments, listReviewerCandidates, listReviewReactions, listReviews, listReviewsForBranch, listReviewSubmissions, listReviewTimelineEvents, loginAndPersist, mergeReview, moveBranch, openInProgram, openInTerminal, peelRestoreSnapshot, ProgramCategory, publishReview, removeBranch, removeCommentReaction, removeReviewLabel, removeReviewReaction, requestReview, resolveCommitConflictHunks, restoreSnapshotWithKind, reviewApply, reviewTemplate, setGbConfig, setPushRemote, setReviewAutoMerge, setReviewDraftiness, setReviewTemplate, setTargetRefAndInitProject, storeBitbucketApiToken, storeGithubPat, storeGitlabPat, tearOffBranch, treeChangeDiffs, unapplyStack, updateBranchName, updateProfileAndPersist, updateProjectSettings, updateReview, updateReviewComment, updateReviewFooters, warmCiChecksCache, withdrawReviewRequest, workspaceBranchAndAncestorsPush, workspaceCheckout, workspaceFetchFromRemotes, workspaceFetchStatus, workspaceIntegrateUpstream, workspaceTargetCommits, WatcherHandle, ANY_FORK, ANY_FORK_OR_MERGE, ANY_MERGE, askpassInit, askpassSubmitPromptResponse, CHILD, getAppSettings, HORIZ_ANCESTOR, HORIZ_PARENT, HORIZONTAL, LEFT_FORK, LEFT_FORK_ANCESTOR, LEFT_FORK_PARENT, LEFT_MERGE, LEFT_MERGE_ANCESTOR, LEFT_MERGE_PARENT, RIGHT_FORK, RIGHT_FORK_ANCESTOR, RIGHT_FORK_PARENT, RIGHT_MERGE, RIGHT_MERGE_ANCESTOR, RIGHT_MERGE_PARENT, updateFeatureFlags, updateFetch, updateOnboardingComplete, updateReviews, updateTelemetry, updateTelemetryDistinctId, updateUi, VERT_ANCESTOR, VERT_PARENT, VERTICAL, watcherStart } = nativeBinding
export { absorb }
export { absorptionPlan }
export { addCommentReaction }
@@ -608,6 +608,7 @@ export { commentsList }
export { commentUpdate }
export { commitAmend }
export { commitCherryPick }
+export { commitConflicts }
export { commitCreate }
export { commitDetailsWithLineStats }
export { commitDiscard }
@@ -684,6 +685,7 @@ export { removeCommentReaction }
export { removeReviewLabel }
export { removeReviewReaction }
export { requestReview }
+export { resolveCommitConflictHunks }
export { restoreSnapshotWithKind }
export { reviewApply }
export { reviewTemplate }
diff --git a/packages/but-sdk/src/generated/linear/apiParamNames.d.ts b/packages/but-sdk/src/generated/linear/apiParamNames.d.ts
index 8dd9face820..808f799e587 100644
--- a/packages/but-sdk/src/generated/linear/apiParamNames.d.ts
+++ b/packages/but-sdk/src/generated/linear/apiParamNames.d.ts
@@ -29,6 +29,7 @@ export declare const apiParamNames: {
readonly commentsList: readonly ["projectId"];
readonly commitAmend: readonly ["projectId", "commitId", "changes", "changesSource", "dryRun"];
readonly commitCherryPick: readonly ["projectId", "sourceCommitIds", "relativeTo", "side", "dryRun"];
+ readonly commitConflicts: readonly ["projectId", "commitId"];
readonly commitCreate: readonly ["projectId", "relativeTo", "side", "changes", "changesSource", "message", "dryRun"];
readonly commitDetailsWithLineStats: readonly ["projectId", "commitId"];
readonly commitDiscard: readonly ["projectId", "subjectCommitId", "dryRun"];
@@ -104,6 +105,7 @@ export declare const apiParamNames: {
readonly removeReviewLabel: readonly ["projectId", "reviewId", "label"];
readonly removeReviewReaction: readonly ["projectId", "reviewId", "reactionId"];
readonly requestReview: readonly ["projectId", "reviewId", "logins"];
+ readonly resolveCommitConflictHunks: readonly ["projectId", "commitId", "specs"];
readonly restoreSnapshotWithKind: readonly ["projectId", "restoreKind", "sha"];
readonly reviewApply: readonly ["projectId", "reviewId"];
readonly reviewTemplate: readonly ["projectId"];
diff --git a/packages/but-sdk/src/generated/linear/apiParamNames.js b/packages/but-sdk/src/generated/linear/apiParamNames.js
index 36ec8cc4e83..6a077431740 100644
--- a/packages/but-sdk/src/generated/linear/apiParamNames.js
+++ b/packages/but-sdk/src/generated/linear/apiParamNames.js
@@ -29,6 +29,7 @@ export const apiParamNames = {
commentsList: ["projectId"],
commitAmend: ["projectId", "commitId", "changes", "changesSource", "dryRun"],
commitCherryPick: ["projectId", "sourceCommitIds", "relativeTo", "side", "dryRun"],
+ commitConflicts: ["projectId", "commitId"],
commitCreate: ["projectId", "relativeTo", "side", "changes", "changesSource", "message", "dryRun"],
commitDetailsWithLineStats: ["projectId", "commitId"],
commitDiscard: ["projectId", "subjectCommitId", "dryRun"],
@@ -104,6 +105,7 @@ export const apiParamNames = {
removeReviewLabel: ["projectId", "reviewId", "label"],
removeReviewReaction: ["projectId", "reviewId", "reactionId"],
requestReview: ["projectId", "reviewId", "logins"],
+ resolveCommitConflictHunks: ["projectId", "commitId", "specs"],
restoreSnapshotWithKind: ["projectId", "restoreKind", "sha"],
reviewApply: ["projectId", "reviewId"],
reviewTemplate: ["projectId"],
diff --git a/packages/but-sdk/src/generated/linear/index.d.ts b/packages/but-sdk/src/generated/linear/index.d.ts
index 4a719e8d795..fc0099b322a 100644
--- a/packages/but-sdk/src/generated/linear/index.d.ts
+++ b/packages/but-sdk/src/generated/linear/index.d.ts
@@ -263,6 +263,19 @@ export declare function commitAmend(projectId: string, commitId: string, changes
*/
export declare function commitCherryPick(projectId: string, sourceCommitIds: Array, relativeTo: RelativeTo, side: InsertSide, dryRun: boolean): Promise
+/**
+ * Return the conflicts of the conflicted commit `commit_id` without entering
+ * edit mode or touching the working tree.
+ *
+ * Hunks are identified by `(path, 1-based index)`; the extraction is
+ * deterministic, so the same commit id always yields the same hunks and
+ * `resolve_commit_conflict_hunks()` can be called with indices from this
+ * result. Fails for commits whose conflicts have no hunk representation
+ * (deletions/renames, binaries, oversized files, marker-like content) — those
+ * need manual resolution in edit mode.
+ */
+export declare function commitConflicts(projectId: string, commitId: string): Promise
+
/**
* Insert a new commit built from the `changes` of `changes_source` and record
* an oplog snapshot on success.
@@ -846,6 +859,21 @@ export declare function removeReviewReaction(projectId: string, reviewId: number
/** Request reviews from the given users on a review. */
export declare function requestReview(projectId: string, reviewId: number, logins: Array): Promise
+/**
+ * Apply `specs` to the conflicted commit `commit_id` and rebase descendants.
+ *
+ * Resolving a subset of the conflicts rewrites the commit into a conflicted
+ * commit with only the remaining conflicts; resolving all of them rewrites it
+ * into a normal commit. Either way the commit id changes — address follow-up
+ * resolutions to the returned `new_commit`. An oplog snapshot records an undo
+ * point. Nothing is written if any spec fails validation.
+ *
+ * [`HunkResolution::Ai`] specs are sent to the configured LLM first (no
+ * worktree lock is held during the model call); AI configuration is only
+ * required when such a spec is present.
+ */
+export declare function resolveCommitConflictHunks(projectId: string, commitId: string, specs: Array): Promise
+
/**
* Restores the project to a specific snapshot using a specific kind of restore. This operation
* also creates a new snapshot in the oplog.
@@ -1799,6 +1827,16 @@ export type CommitCherryPickResult = {
workspace: WorkspaceState;
};
+/** JSON transport type for the conflicts of a conflicted commit. */
+export type CommitConflicts = {
+ /** The conflicted commit. */
+ commitId: string;
+ /** The conflicted files that decompose into hunks, sorted by path. */
+ files: Array;
+ /** Conflicted files that need manual resolution in edit mode. */
+ manual: Array;
+};
+
/** JSON transport type for creating a commit in the rebase graph. */
export type CommitCreateResult = {
/** The new commit if one was created. */
@@ -2717,6 +2755,8 @@ export type HunkResolutionResult = {
commitEmptied: boolean;
/** The conflicts that remain, per file. */
remaining: Array;
+ /** Conflicted files that need manual resolution in edit mode. */
+ manual: Array;
/** Workspace state after the apply. */
workspace: WorkspaceState;
};
@@ -2951,6 +2991,18 @@ export type LoginToken = {
url: string;
};
+/**
+ * A conflicted file with no hunk representation — a side deletion or rename, a
+ * non-blob entry, a binary, or one too large to splice — which therefore needs
+ * manual resolution in edit mode.
+ */
+export type ManualConflict = {
+ /** The repo-relative path of the file. */
+ path: string;
+ /** Why it cannot be resolved automatically, for display to the user. */
+ reason: string;
+};
+
/**
* An optional full reference name accepted as a string like `refs/heads/main`,
* for use as a parameter transport via `#[but_api(...)]`.
@@ -3284,6 +3336,19 @@ export type RepoPermissions = {
pull: boolean;
};
+/**
+ * One conflict to resolve, addressed by path and 1-based hunk index as
+ * returned by `commit_conflicts()`.
+ */
+export type ResolutionSpec = {
+ /** The repo-relative path of the conflicted file. */
+ path: string;
+ /** The 1-based index of the conflict within the file. */
+ hunk: number;
+ /** How to resolve it. */
+ resolution: HunkResolution;
+};
+
/** How one conflicted file was resolved, for display to the user. */
export type ResolvedFile = {
/** The repo-relative path of the file. */
diff --git a/packages/but-sdk/src/generated/linear/index.js b/packages/but-sdk/src/generated/linear/index.js
index 791a6987bfd..1530a4094f4 100644
--- a/packages/but-sdk/src/generated/linear/index.js
+++ b/packages/but-sdk/src/generated/linear/index.js
@@ -579,7 +579,7 @@ if (!nativeBinding) {
throw new Error(`Failed to load native binding`)
}
-const { absorb, absorptionPlan, addCommentReaction, addReviewLabels, addReviewReaction, apply, applyBranchIntegration, assignHunk, branchCannedName, branchCheckout, branchCheckoutNew, branchCreate, branchDetails, branchDiff, branchLand, branchList, branchRemove, branchRename, changesInWorktree, changesInWorktreeWithPerm, checkGithubAuthStatus, checkSigningSettings, commentArchive, commentCreate, commentsList, commentUpdate, commitAmend, commitCherryPick, commitCreate, commitDetailsWithLineStats, commitDiscard, commitDiscardChanges, commitInsertBlank, commitMove, commitMoveChangesBetween, commitReword, commitSquash, commitUncommit, commitUncommitChanges, commitUncommitChangesFromCommits, createReviewComment, currentForgeLogin, deleteAllData, deleteProject, deleteReviewComment, deleteUser, discardWorktreeChanges, forgeCompareBranchUrl, forgeInfo, forgeProvider, forgetBitbucketAccount, forgetGithubAccount, forgetGitlabAccount, getBbUser, getGbConfig, getGhUser, getGlUser, getInitialBranchIntegration, getLoginToken, getRedoTargetSnapshot, getRepoInfo, getReview, getReviewBaseRepoUrl, getReviewMergeStatus, getTerminalOptionsForPlatform, getUndoTargetSnapshot, getUserProfileLocal, getWorkspace, gitTestFetch, gitTestPush, headInfo, initApplicationNamespace, initGithubDeviceOauth, listAvailableReviewTemplates, listBranches, listCiChecks, listCommentReactions, listEditors, listKnownBitbucketAccounts, listKnownGithubAccounts, listKnownGitlabAccounts, listPrograms, listProjectsStateless, listRepoLabels, listReviewComments, listReviewerCandidates, listReviewReactions, listReviews, listReviewsForBranch, listReviewSubmissions, listReviewTimelineEvents, loginAndPersist, mergeReview, moveBranch, openInProgram, openInTerminal, peelRestoreSnapshot, ProgramCategory, publishReview, removeBranch, removeCommentReaction, removeReviewLabel, removeReviewReaction, requestReview, restoreSnapshotWithKind, reviewApply, reviewTemplate, setGbConfig, setPushRemote, setReviewAutoMerge, setReviewDraftiness, setReviewTemplate, setTargetRefAndInitProject, storeBitbucketApiToken, storeGithubPat, storeGitlabPat, tearOffBranch, treeChangeDiffs, unapplyStack, updateBranchName, updateProfileAndPersist, updateProjectSettings, updateReview, updateReviewComment, updateReviewFooters, warmCiChecksCache, withdrawReviewRequest, workspaceBranchAndAncestorsPush, workspaceCheckout, workspaceFetchFromRemotes, workspaceFetchStatus, workspaceIntegrateUpstream, workspaceTargetCommits, WatcherHandle, ANY_FORK, ANY_FORK_OR_MERGE, ANY_MERGE, askpassInit, askpassSubmitPromptResponse, CHILD, getAppSettings, HORIZ_ANCESTOR, HORIZ_PARENT, HORIZONTAL, LEFT_FORK, LEFT_FORK_ANCESTOR, LEFT_FORK_PARENT, LEFT_MERGE, LEFT_MERGE_ANCESTOR, LEFT_MERGE_PARENT, RIGHT_FORK, RIGHT_FORK_ANCESTOR, RIGHT_FORK_PARENT, RIGHT_MERGE, RIGHT_MERGE_ANCESTOR, RIGHT_MERGE_PARENT, updateFeatureFlags, updateFetch, updateOnboardingComplete, updateReviews, updateTelemetry, updateTelemetryDistinctId, updateUi, VERT_ANCESTOR, VERT_PARENT, VERTICAL, watcherStart } = nativeBinding
+const { absorb, absorptionPlan, addCommentReaction, addReviewLabels, addReviewReaction, apply, applyBranchIntegration, assignHunk, branchCannedName, branchCheckout, branchCheckoutNew, branchCreate, branchDetails, branchDiff, branchLand, branchList, branchRemove, branchRename, changesInWorktree, changesInWorktreeWithPerm, checkGithubAuthStatus, checkSigningSettings, commentArchive, commentCreate, commentsList, commentUpdate, commitAmend, commitCherryPick, commitConflicts, commitCreate, commitDetailsWithLineStats, commitDiscard, commitDiscardChanges, commitInsertBlank, commitMove, commitMoveChangesBetween, commitReword, commitSquash, commitUncommit, commitUncommitChanges, commitUncommitChangesFromCommits, createReviewComment, currentForgeLogin, deleteAllData, deleteProject, deleteReviewComment, deleteUser, discardWorktreeChanges, forgeCompareBranchUrl, forgeInfo, forgeProvider, forgetBitbucketAccount, forgetGithubAccount, forgetGitlabAccount, getBbUser, getGbConfig, getGhUser, getGlUser, getInitialBranchIntegration, getLoginToken, getRedoTargetSnapshot, getRepoInfo, getReview, getReviewBaseRepoUrl, getReviewMergeStatus, getTerminalOptionsForPlatform, getUndoTargetSnapshot, getUserProfileLocal, getWorkspace, gitTestFetch, gitTestPush, headInfo, initApplicationNamespace, initGithubDeviceOauth, listAvailableReviewTemplates, listBranches, listCiChecks, listCommentReactions, listEditors, listKnownBitbucketAccounts, listKnownGithubAccounts, listKnownGitlabAccounts, listPrograms, listProjectsStateless, listRepoLabels, listReviewComments, listReviewerCandidates, listReviewReactions, listReviews, listReviewsForBranch, listReviewSubmissions, listReviewTimelineEvents, loginAndPersist, mergeReview, moveBranch, openInProgram, openInTerminal, peelRestoreSnapshot, ProgramCategory, publishReview, removeBranch, removeCommentReaction, removeReviewLabel, removeReviewReaction, requestReview, resolveCommitConflictHunks, restoreSnapshotWithKind, reviewApply, reviewTemplate, setGbConfig, setPushRemote, setReviewAutoMerge, setReviewDraftiness, setReviewTemplate, setTargetRefAndInitProject, storeBitbucketApiToken, storeGithubPat, storeGitlabPat, tearOffBranch, treeChangeDiffs, unapplyStack, updateBranchName, updateProfileAndPersist, updateProjectSettings, updateReview, updateReviewComment, updateReviewFooters, warmCiChecksCache, withdrawReviewRequest, workspaceBranchAndAncestorsPush, workspaceCheckout, workspaceFetchFromRemotes, workspaceFetchStatus, workspaceIntegrateUpstream, workspaceTargetCommits, WatcherHandle, ANY_FORK, ANY_FORK_OR_MERGE, ANY_MERGE, askpassInit, askpassSubmitPromptResponse, CHILD, getAppSettings, HORIZ_ANCESTOR, HORIZ_PARENT, HORIZONTAL, LEFT_FORK, LEFT_FORK_ANCESTOR, LEFT_FORK_PARENT, LEFT_MERGE, LEFT_MERGE_ANCESTOR, LEFT_MERGE_PARENT, RIGHT_FORK, RIGHT_FORK_ANCESTOR, RIGHT_FORK_PARENT, RIGHT_MERGE, RIGHT_MERGE_ANCESTOR, RIGHT_MERGE_PARENT, updateFeatureFlags, updateFetch, updateOnboardingComplete, updateReviews, updateTelemetry, updateTelemetryDistinctId, updateUi, VERT_ANCESTOR, VERT_PARENT, VERTICAL, watcherStart } = nativeBinding
export { absorb }
export { absorptionPlan }
export { addCommentReaction }
@@ -608,6 +608,7 @@ export { commentsList }
export { commentUpdate }
export { commitAmend }
export { commitCherryPick }
+export { commitConflicts }
export { commitCreate }
export { commitDetailsWithLineStats }
export { commitDiscard }
@@ -684,6 +685,7 @@ export { removeCommentReaction }
export { removeReviewLabel }
export { removeReviewReaction }
export { requestReview }
+export { resolveCommitConflictHunks }
export { restoreSnapshotWithKind }
export { reviewApply }
export { reviewTemplate }