Skip to content

Improve check-conflicts command to skip /vendor, /var/cache and work with left and right <<< >>> conflict sides #103

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

Merged
TomasVotruba merged 5 commits into from
Jul 21, 2025

check conflicts both ways

dbf27ce
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Merged

Improve check-conflicts command to skip /vendor, /var/cache and work with left and right <<< >>> conflict sides #103

check conflicts both ways
dbf27ce
Select commit
Loading
Failed to load commit list.

The logs for this run have expired and are no longer available.