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

Jj40 doc #4914

Merged
merged 4 commits into from
Jan 30, 2019
Merged

Jj40 doc #4914

merged 4 commits into from
Jan 30, 2019

Conversation

wanleg
Copy link
Contributor

@wanleg wanleg commented Jan 22, 2019

update jj40 documentation to recover from soft-brick using an arduino.
borrowed info from #2601

@mechmerlin
Copy link
Contributor

whoa thats a lot of files changed! 111!

@wanleg
Copy link
Contributor Author

wanleg commented Jan 23, 2019

wtf? i knew something went weird - maybe cuz i was editing files from github directly instead of working locally? after i submitted my PR (see initial commit), Travis failed and I was like, "how is editing a single .md causing Travis to fail?!" so i left it overnight and then re-did the whole thing locally and then pushed like normal and now here we are...
only meant to do this:
11ae022

@noroadsleft
Copy link
Member

I think for some reason, if you edit a file that's in a keyboard folder, Travis CI checks all the keymaps, even if you didn't edit any of them.

If you have a Git CLI, you could do:

git reset --hard 11ae022
git push --force-with-lease

You might need to use push --force instead of push --force-with-lease, if the latter fails.

@wanleg
Copy link
Contributor Author

wanleg commented Jan 24, 2019

tried git reset --hard 11ae022 git push --force-with-lease
Travis didn't like that...

@drashna
Copy link
Member

drashna commented Jan 24, 2019

@wanleg That's fine. Travis doesn't like it because some of the keymaps don't compile correctly. Like mine, for instance.

The default keymap compiles fine, and that's the important part.

@wanleg wanleg mentioned this pull request Jan 29, 2019
Merged
@drashna
Copy link
Member

drashna commented Jan 30, 2019

Thanks

@drashna drashna merged commit 58f3ce5 into qmk:master Jan 30, 2019
@wanleg wanleg deleted the jj40_doc branch January 31, 2019 01:38
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jan 31, 2019
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
81e5bb1 
* 'master' of https://github.com/qmk/qmk_firmware: (43 commits)
  Remove duplicate make invocations
  Fix file size check for parallel make (qmk#5012)
  [Keyboard] 40percent.club's Half 'n' half keyboard port (qmk#5005)
  update canoe/readme (qmk#5014)
  [Keyboard][S65-X] BACKLIGHT_CAPS_LOCK (qmk#4770)
  space65-5001 init, small corrections to the total number of leds (qmk#5006)
  [Keyboard] add dz60rgb keyboard (qmk#4992)
  [Keyboard] Jj40 doc (qmk#4914)
  [Keyboard] Redox Wireless configurator bugfix (qmk#4961)
  added aanzee pcb support (qmk#4962)
  Sweet16 Keymap by Spaceman added (qmk#5003)
  [Keyboard] Gray Studio Directory (qmk#5002)
  Fix link and name spelling in Space65's readme (qmk#5004)
  [Keymap] Updates to ortho_4x12/buswerks keymap (qmk#4996)
  [Keyboard] Gray Studio Space 65 Support (qmk#5001)
  Moving cannonkeys boards to one place, eeprom fix (qmk#4999)
  convert to unix line-endings [skip ci]
  S60x Make Default standard layout and have separate Mac OS one (qmk#4964)
  [Keyboard] Bug Fix To Unigo66 (qmk#4995)
  Contribute the MechMerlin QMK Configurator docs (qmk#4986)
  ...
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Feb 9, 2019
@wanleg @zer09
[Keyboard] Jj40 doc (qmk#4914)
f3b4ec9 
* Update README.md

* Update README.md

* Update README.md

* Update README.md
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
@wanleg
[Keyboard] Jj40 doc (qmk#4914)
f82598e 
* Update README.md

* Update README.md

* Update README.md

* Update README.md
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

@fredizzimo fredizzimo Awaiting requested review from fredizzimo

@jackhumbert jackhumbert Awaiting requested review from jackhumbert

@mechmerlin mechmerlin Awaiting requested review from mechmerlin

@skullydazed skullydazed Awaiting requested review from skullydazed

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

Successfully merging this pull request may close these issues.
4 participants
@wanleg @mechmerlin @noroadsleft @drashna