Skip to content

Fix git history so automated PR tool stops creating empty PRs#63

Merged
phillip-stephens merged 2 commits intomasterfrom
phillip/sync-with-upstream
Sep 26, 2025
Merged

Fix git history so automated PR tool stops creating empty PRs#63
phillip-stephens merged 2 commits intomasterfrom
phillip/sync-with-upstream

Conversation

@phillip-stephens
Copy link

The automated sync script to sync us with the miekg upstream keeps firing and creating empty PRs. I think it's because commit 294d373 isn't in our history, it was squashed in on a different commit. So the changes of it were added to zmap/dns, but the commit ID isn't in our branch history. Therefore it shows up as a commit ID we're missing in our branch, causing the sync tool to fire again and again.

@phillip-stephens phillip-stephens marked this pull request as ready for review September 26, 2025 18:09
@phillip-stephens phillip-stephens merged commit 81f8f99 into master Sep 26, 2025
6 checks passed
@phillip-stephens phillip-stephens deleted the phillip/sync-with-upstream branch September 26, 2025 18:32
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.

2 participants