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

Update develop merge sequence to reflect no-ff, no-squash. #13038

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Update develop merge sequence to reflect no-ff, no-squash. #13038

merged 1 commit into from
Jun 17, 2021

Conversation

tzarc
Copy link
Member

@tzarc tzarc commented May 30, 2021

Description

As it says on the tin.

Types of Changes

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

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).

@tzarc tzarc requested review from noroadsleft and a team May 30, 2021 00:51
@zvecr zvecr merged commit e7ddbc3 into qmk:master Jun 17, 2021
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
@tzarc @HokieGeek
Update merge sequence to reflect no-ff, no-squash. (qmk#13038)
02bbb67
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
@tzarc @wox
Update merge sequence to reflect no-ff, no-squash. (qmk#13038)
17cd544
@tzarc tzarc deleted the develop-merge-sequence branch August 19, 2021 21:52
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@tzarc @nhongooi
Update merge sequence to reflect no-ff, no-squash. (qmk#13038)
c3dea1c
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@tzarc
Update merge sequence to reflect no-ff, no-squash. (qmk#13038)
ac76850
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@zvecr zvecr zvecr approved these changes

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

Assignees
No one assigned
Labels
documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tzarc @drashna @zvecr