Traumflug

> I've took 'ours' not 'theirs'. Or reverse?!? I sometimes wonder where people learn such stuff. "It doesn't work! It doesn't work!" ... and if one manages to catch such...

P.S.: for playing with another branch to not mess up the original (good idea!) I'd simply duplicate the existing one: `git branch ` Then you can rebase and rebase -i...

> Traumflug seems to have created his own workflow This workflow certainly isn't an invention of me, it's well documented as "topic branches". Git comes with quite a number of...

> Repair, commit. Repair, add, rebase --continue Other than that, what's the problem? You have 6 commits locally on top of the remote branch. Looks perfectly fine.

> rebase experimental~74 Looking at what's in the public repo, branch _arm-stm32f411-port_ is based on _experimental~74_ already, so it's no surprise another rebase attempt does nothing. To move up the...

> Whatever I made, an old commit is duplicated in front. What is the content of this "duplicate"? If commits don't match 100%, the differing part is left in the...

> git checkout arm-stm32f411-port > git pull Again you mix rebasing with pushing/pulling. Please stop it! If you're the only contributor to this branch there's never a need to pull...

> I'm on a different computer In this case you're technically two users. Do the rebase on the computer with the newer development, after having this done, push it to...

> Btw. the Pin-Registers is a CortexM0 only thing?!? Pin I/O is considered to be a "peripheral", so yes, it might be different on your MCU. Likely less a "M0-only"...

> git rebase -i HEAD~x is a nice way to repair some commits. Glad to see you start to see the advantages of Git and topic branches!