7 years, 1 month ago.

How do I merge my repo to the main repo?

Somehow I have managed to get my local copy of the repo out of sync with the main repo. I initially loaded the main repo (2nd one below) into the online compiler and did some work on it. Soon I decided it would be better to work in my own fork and then update the main branch with tested code. So I forked it and began working in my forked branch (I am not even sure how to provide a link to this) and occasionally "updated" the "main" repo, which was evidently the first one below and not the second.

https://os.mbed.com/users/charlesdavidyoung/code/GEO_COUNTER_L432KC/

https://os.mbed.com/teams/Geo-Electronics-Geo-Counter/code/GEO_COUNTER_L432KC/

It is all very confusing. Did the problem start when I forked the code? BTW I cloned my fork to my desktop. My normal workflow is to make changes on my local pc, commit them, push them, and update on the Mbed compiler. Then I compile and test and repeat. When I have a stable version I will update the "main" branch, which is evidently the first one above. I don't know how to get the second branch (the original) synced up with my "local" branch.

I have looked to help with this on your website without luck.

Thanks Charles