Git History Cleanup

[Gentoli]

Hi,

I was trying to merge your master to upstream, that resulted in more than 900 file conflicts.

Looking at your git history, you have added files from upstream to non merge commits. Here are the TWO commits that contains content from upstream that is not a merge commit:

• https://github.com/Massdrop/qmk_firmware/commit/441b212c86c7c7ab17788bc27be3cfd12f827ae4
  • looks like a --squash commit (squash only contains content not history)
• https://github.com/Massdrop/qmk_firmware/commit/22a446c8ee480ea97f59bf8d95ac84a93bf8c24a
  • merged to upstream in branch but squash to master. This does not preserve history either.

I have went back and cherry-pick all the commits since https://github.com/Massdrop/qmk_firmware/commit/441b212c86c7c7ab17788bc27be3cfd12f827ae4 from master to drop-ok with merges to upstream in between. This reduced the conflicting files to 12.

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   keyboards/massdrop/alt/keymaps/default_md/keymap.c
        both modified:   keyboards/massdrop/alt/keymaps/mac_md/keymap.c
        both modified:   keyboards/massdrop/ctrl/keymaps/default/keymap.c
        both modified:   keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
        both modified:   keyboards/massdrop/ctrl/keymaps/mac/keymap.c
        both modified:   keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c
        both modified:   tmk_core/common/arm_atsam/suspend.c
        both modified:   tmk_core/protocol/arm_atsam/led_matrix.c
        both modified:   tmk_core/protocol/arm_atsam/main_arm_atsam.c
        both modified:   tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
        both modified:   tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
        both modified:   tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h

I hope my branch can help you catch up/merge back to upstream.

For this repository, I would suggest resetting master in some way. If you don't need to preserve history, you can squash the current changes to the upstream commit you are branching off from.

[domoaligato]

This is even more out of date now and the carina, shift, and rocketeer keyboards are not upstream. Can someone please have a look at this?

[wolfspyre]

@just-another-jxliu ... samesame... it would be swell to see this repo getting back in sync with upstream. What's preventing this? If y'all at drop need some git-fu help, I'm sure there are many users of your keyboards who would be willing to help you through the process (Git surgery is legitimately not fun.)