search

ARMmbed / stm32customtargets

Enable the support of your custom boards in mbed-os 6
19 stars 14 forks source link

Added some E5 board + Fixes #13

Closed hallard closed 3 years ago

hallard commented 3 years ago
hallard commented 3 years ago

All requested changes done

jeromecoutant commented 3 years ago

Mmm,I know you love git commands... But, same rule as in mbed-os repo, merge commit is not allowed. Could you rebase your commits on top of master, and force push again to this PR ? Thx

jeromecoutant commented 3 years ago

I am sorry, last commit is a merge one... Could you rebase your commits on top of master, and force push again to this PR ? (clean branch starting from origin/master) Thx

hallard commented 3 years ago

I am sorry, last commit is a merge one... Could you rebase your commits on top of master, and force push again to this PR ? (clean branch starting from origin/master) Thx

humm, I'm very sorry sometimes git is equal to some magic for me. I merged upstream/master (your repo) into my master repos (the one I forked from you), then I also merged upstream/master into this branch E5_DevBoardswhich contains these changes. so for me it's up to date with master and contains only changes, but my be I'm missing something.

It looks like it's confirmed by git client, rebase from origin/master is not possible because it's already up to date

image

and from upstream/master either image

Do I miss something? I can also close this PR, save my files, create new clean branch/new PR with saved file if you're more confortable with that. Just let me know.

hallard commented 3 years ago

replaced by clean #15