Skip to content

prefix git conflict grep path with git repo root #327

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
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

prefix git conflict grep path with git repo root #327

wants to merge 1 commit into from

Conversation

turbocrime
Copy link

fixes #326

turbocrime
turbocrime commented Jul 6, 2025
View reviewed changes
functions/geometry_git
Comment on lines +76 to +78
git_root=$(git rev-parse --show-toplevel)

conflict_list=$($_grep -cH '^=======$' ${git_root/$^conflicts})
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this expansion feels fragile, not sure of best practice here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge conflict display fails if CWD is not git repo root
1 participant
@turbocrime