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.

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

dns_blocklists.cf isn't appended to main.cf and therefore ineffective… #5342

Merged
merged 5 commits into from
Jul 30, 2023
Merged

dns_blocklists.cf isn't appended to main.cf and therefore ineffective… #5342

merged 5 commits into from
Jul 30, 2023

Conversation

DocFraggle
Copy link
Contributor

see issue #5340

@milkmaker
Copy link
Collaborator

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@DerLinkman DerLinkman changed the base branch from master to staging July 30, 2023 17:01
@DerLinkman DerLinkman merged commit dabf910 into mailcow:staging Jul 30, 2023
3 of 4 checks passed
@milkmaker milkmaker mentioned this pull request Jul 30, 2023
Merged
@DocFraggle DocFraggle deleted the mailcow_spamhaus branch July 30, 2023 17:57
@topa-LE
Copy link

topa-LE commented Aug 1, 2023 

Fetching updated code from remote...
Merging local with remote code (recursive, strategy: "theirs", options: "patience"...
error: The following untracked working tree files would be overwritten by merge:
        data/conf/postfix/dns_blocklists.cf
Please move or remove them before you merge.
Aborting

@DocFraggle
Copy link
Contributor Author

Hi @topa-LE, this error is not related to the above PR, but have a look here: #5351

You have to delete/move/rename the file before using update.sh

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.

None yet
6 participants
@DocFraggle @milkmaker @topa-LE @ctrl-i @DerLinkman @FreddleSpl0it