Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git merge file cli arguments misnamed #1703

Closed
cemoktra opened this issue Nov 25, 2024 · 1 comment · Fixed by #1704
Closed

git merge file cli arguments misnamed #1703

cemoktra opened this issue Nov 25, 2024 · 1 comment · Fixed by #1704
Labels
acknowledged an issue is accepted as shortcoming to be fixed

Comments

@cemoktra
Copy link

Current behavior 😯

Both "ours" and "theirs" are documented as "ours" in help

gix merge file --help
Merge a file by specifying ours, base and theirs

Usage: gix merge file [OPTIONS] <OURS> <BASE> <OURS>

Expected behavior 🤔

gix merge file --help
Merge a file by specifying ours, base and theirs

Usage: gix merge file [OPTIONS] <OURS> <BASE> <THEIRS>

Git behavior

No response

Steps to reproduce 🕹

No response
Byron added a commit that referenced this issue Nov 25, 2024
@Byron
fix: gix merge file now uses THEIRS instead of OURS where needed (
0727b56 
#1703)
@Byron Byron mentioned this issue Nov 25, 2024
Merged
@Byron Byron added the acknowledged an issue is accepted as shortcoming to be fixed label Nov 25, 2024
@Byron
Copy link
Member

Byron commented Nov 25, 2024

Thanks a lot, a fix is on the way!

Byron added a commit that referenced this issue Nov 25, 2024
@Byron
Merge pull request #1704 from GitoxideLabs/fix-1703
e8ce25f 
fix: `gix merge file` now uses `THEIRS` instead of `OURS` where needed (#1703)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
acknowledged an issue is accepted as shortcoming to be fixed
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

fix: gix merge file now uses THEIRS instead of OURS where needed (#1703) GitoxideLabs/gitoxide
2 participants
@Byron @cemoktra