Merge conflict with new firmware update about adv360-pro-zmk

[michaelglass]

I believe with those merge conflicts, you can just choose your own diff and ignore the files in the 3.0 branch. WHOOPS

[ReFil]

The update removes 8 "&none" entries from each layer in the adv360.keymap and keymap.json, choosing your own diff will result in keys being shifted across.

you can see in the diff where the entries are removed, just remove them from your own keymap in each layer and it will work
https://github.com/Valentin-Seehausen/Adv360-Pro-ZMK/pull/3/files#diff-df49145a9e31146b8135f11531a1734a3ec03e1340e9eb6a9016cbb39aea7308

[ReFil]

here are the &none entries that need removing in adv360.keymap

[Valentin-Seehausen]

Ok so I basically accept all your diffs and none of mine?

Thanks for the prompt reply. Have to say support is amazing.

[Valentin-Seehausen]

@ReFil ?

[ReFil]

Apologies, yes if you accept my changes the merge conflicts will be resolved however your custom keymap will not be reserved. The easiest way is probably to screenshot it in the editor and recreate it

[Valentin-Seehausen]

Come on, that is not a solution! This is a high-end product.

What about the solution I proposed?

[ReFil]

An alternative option is removing the unnecessary &none entries in your keymap as i detailed here

[gridlocdev]

I've put together some ideas in Discussion #170 for how these types of upgrades could be made a bit smoother, since I ran into this as well.

[Valentin-Seehausen]

The update removes 8 "&none" entries from each layer in the adv360.keymap and keymap.json, choosing your own diff will result in keys being shifted across.

you can see in the diff where the entries are removed, just remove them from your own keymap in each layer and it will work https://github.com/Valentin-Seehausen/Adv360-Pro-ZMK/pull/3/files#diff-df49145a9e31146b8135f11531a1734a3ec03e1340e9eb6a9016cbb39aea7308

For the records, I removed the &none entries from my file and I now have these merge conflicts: Valentin-Seehausen#4

[ReFil]

You're attempting to merge in V3.0 beta in that PR. This changes a lot of things and will lead to conflicts. An upgrade guide hasn't been written yet for V3.0, it's not ready for inexperienced users hence why it's still in beta prerelease testing. Please return to merging in V2.0 first

[Valentin-Seehausen]

You're attempting to merge in V3.0 beta in that PR. This changes a lot of things and will lead to conflicts. An upgrade guide hasn't been written yet for V3.0, it's not ready for inexperienced users hence why it's still in beta prerelease testing. Please return to merging in V2.0 first

But that was the initial idea: https://twitter.com/kinesisergo/status/1664712878124060672

[ReFil]

Closing as solved with the addition of instructions to resolve the conflict