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

fix Issue 16709 - [Reg 2.068] Error: common.to at common.d conflicts … #10793

Merged
merged 1 commit into from
Feb 16, 2020

Conversation

WalterBright
Copy link
Member

…with common.to at common.d

Too ancient for stable.

@dlang-bot
Copy link
Contributor

Thanks for your pull request, @WalterBright!

Bugzilla references

Auto-close Bugzilla Severity Description
16709 regression [Reg 2.068] Error: common.to at common.d conflicts with common.to at common.d

⚠️⚠️⚠️ Warnings ⚠️⚠️⚠️

To target stable perform these two steps:

  1. Rebase your branch to upstream/stable:
git rebase --onto upstream/stable upstream/master
  1. Change the base branch of your PR to stable

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub fetch digger
dub run digger -- build "master + dmd#10793"

@WalterBright WalterBright force-pushed the fix16709 branch 2 times, most recently from 0f2cfad to 80b58e1 Compare February 16, 2020 09:30
@dlang-bot dlang-bot merged commit 928dfab into dlang:master Feb 16, 2020
@WalterBright WalterBright deleted the fix16709 branch February 16, 2020 19:34
tramker added a commit to tramker/dmd that referenced this pull request Jul 24, 2020
fix Issue 16709 - [Reg 2.068] Error: common.to at common.d conflicts …
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Conflicts:
	src/dmd/dsymbol.d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants