package
Version:
v0.8.0
Opens a new window with list of versions in this module.
Published: Mar 24, 2026
License: Apache-2.0
Opens a new window with license information.
Imports: 12
Opens a new window with list of imports.
Imported by: 0
Opens a new window with list of known importers.
Documentation
¶
Package resolve implements the ctx pad resolve subcommand.
It resolves merge conflicts in the scratch pad file.
Cmd returns the pad resolve subcommand.
Returns:
- *cobra.Command: Configured resolve subcommand
Run reads and prints both sides of a merge conflict.
Parameters:
- cmd: Cobra command for output
Returns:
- error: Non-nil if no conflict files found or decryption fails
Source Files
¶
Click to show internal directories.
Click to hide internal directories.
