Skip to content

Not mergeable into micropython/master #23

@e-tobi

Description

@e-tobi

Currently your MicroPython fork is not mergeable into the original micropython/master branch. This makes it hard to work on the W60x port using the latest MicroPython.

I took the time to clean up the w60x related commits a little bit by doing the following changes:

  • Merged your initial commits into a single commit
  • Removed changes to non-W60x related code, which should have been git-merged from micropython/master
  • Dropped the wm_tool.exe binary
  • Renamed the commits to match MicroPythons commit message scheme
  • Added new changes from robert-hh and me

It would be nice, if you could take over the revised branch:

https://github.com/e-tobi/micropython/commits/w60x

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions