Open Issues Need Help
View All on GitHub conflict resolver, pick all from branch/stash about 2 hours ago
AI Summary: The user frequently encounters numerous conflicts in single files (e.g., `package-lock.json`) when merging or rebasing branches or stashes, especially after long divergence. The current conflict resolution tools only allow picking individual hunks or all hunks from the *current* side, not specifically from one of the merged sources. They request a new option to accept the complete file version from either the source branch/stash or the target branch, bypassing the need to resolve individual hunks.
Complexity:
4/5
enhancement good first issue