Configure `merge=union` for `changelog.txt` to reduce merge conflicts #381

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

myk002 merged 1 commit into DFHack:master from TymurGubayev:patch-5

Dec 9, 2024

Merged

Configure `merge=union` for `changelog.txt` to reduce merge conflicts #381

Configure `merge=union` for `changelog.txt` to reduce merge conflicts

Annotations

1 warning

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