The Uni change folder location

[petercpark]

Description

Added a keymap to a keyboard. Then moved the entire keyboard folder into a new "stenokeyboards" folder for organizing future projects by StenoKeyboards.

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]

Keyboard moves must go through develop. You might want to submit the keymap addition as a separate PR.

[petercpark]

Keyboard moves must go through develop. You might want to submit the keymap addition as a separate PR.

Okay. Can I make a new commit just deleting the keymap changes? I'll save those for separate PR.

[fauxpark]

There is a merge conflict that needs resolving.

[petercpark]

There is a merge conflict that needs resolving.

Can you help me out with this? All I did was change the location of this file, I don't know what the conflict is.

[drashna]

Assuming that you have the qmk repo set as the upstream remote:

git fetch upstream
git merge upstream/develop

Likely, you'll run into merge conflicts when you do this. When you do, it should tell you how to resolve them, basically. But git status to see which files have conflicts (should be in red).

[petercpark]

I believe the conflict is now gone