feat: add resolve cmd

Author: Rudxain

bin/git-resolve

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -eufo pipefail
+IFS=$' \t'
+
+# https://github.com/tj/git-extras/issues/1234
+# try to manually resolve merge conflicts (if any)
+# in unmerged ("both modified" `status`) files;
+# works with any WD inside work-tree;
+
+#shellcheck disable=SC2046
+# ignore files outside WD, to avoid overload
+git diff --name-only --diff-filter=U --relative -z |
+	while IFS= read -r -d '' f; do
+		if ! git diff --check -- "$f"; then
+			printf '%s\0' "$f"
+		fi
+	done |
+	xargs -0r $(git var GIT_EDITOR)
+
+# user might have removed other conflict-markers,
+# so check full WT
+git diff --name-only --diff-filter=U -z |
+	while IFS= read -r -d '' f; do
+		# WARN: `f` is relative to repo root!
+		# this might be broken
+		if git diff --check -- "$f"; then
+			git add -- "$f"
+		fi
+	done
+
+git continue