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

Resolve info.json/rules.mk feature conflicts in three boards #18942

Merged
merged 3 commits into from
Nov 3, 2022

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented Nov 3, 2022

Description

⚠ 0_sixty/underglow: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature bootmagic is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature mousekey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature extrakey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature console is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature command is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature nkro is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature backlight is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ handwired/reclined: Feature audio is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature bootmagic is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature mousekey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature extrakey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature console is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature command is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ makenova/omega/omega4: Feature nkro is specified in both info.json and rules.mk, the rules.mk value wins.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@fauxpark fauxpark changed the title Resolve info.json/rules.mk feature conflicts in two boards Resolve info.json/rules.mk feature conflicts in three boards Nov 3, 2022
@fauxpark fauxpark requested a review from zvecr November 3, 2022 18:12
@zvecr zvecr merged commit 40122c2 into qmk:develop Nov 3, 2022
@fauxpark fauxpark deleted the features-conflict-res branch November 3, 2022 18:33
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
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.

None yet

2 participants