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.

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

Make substitution fields more prominent and distinct from true 'skeleton' references #71

Merged
merged 1 commit into from
May 28, 2023

Conversation

jaraco
Copy link
Owner

@jaraco jaraco commented Nov 24, 2022

In this change, I'm pondering making the fields more prominent.

I have to say, I'm not excited about the prospect of all of the merge conflicts this will create, so I'll almost certainly not merge it until I have confidence I can automate the resolution of merge conflicts. In https://github.com/jaraco/jaraco.develop/blob/66be40935bbe0904999d035c05f4bdccd1a7d89d/jaraco/develop/merge.py#L69-L73, I've had some success with mechanized resolution.

setup.cfg Show resolved Hide resolved
@jaraco
Copy link
Owner Author

jaraco commented May 28, 2023

In the latest jaraco.develop (7.19.0), the "known merge" technique now simply defers to the "local" changes if the conflict includes PROJECT. That should work for most cases.

@jaraco jaraco merged commit 96ebfe1 into main May 28, 2023
28 of 32 checks passed
@jaraco jaraco deleted the feature/prominent-fields branch May 28, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant