add `resolve` command
Open
Nobody has claimed this yet.
subcommand request
- Dominant language
- Shell
- Stars
- 18.1k
- Forks
- 1.2k
- Avg merge
- 5d 17h
- Merged PRs (30d)
- 1
Description
It works like this (updated to fix bug):
git diff --name-only --diff-filter=U --relative -z |
xargs -0r $(git var GIT_EDITOR) && \
git diff --check . && \
git add . && \
git continue
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start with the command sequence in the issue and compare it with the approximation in .config/git/config from the linked alias. Locate the repository's command entry point and existing command tests, then verify that done means resolving unmerged files, passing git diff --check, staging changes, and continuing the operation.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, shell
- Domain
- cli
- Issue type
- Feature
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 55/100