How to keep forked repositories updated

RE: How to keep forked repositories updated

Priyanka — Mon, 31 Jan 2022 10:10:08 GMT

Hi,

In order to update to v2.7.0, you can run git checkout v2.7.0-ncs1

Or you could also do:

git checkout <nrf repo associated with zephyr repo 2.7.0-ncs1>
west update

From you nrf folder.

After this you can test your project and resolve your issues, which might occur only if there are any changes in API in the newer versions.

Regards,

Priyanka

RE: How to keep forked repositories updated

Priyanka — Fri, 28 Jan 2022 16:03:20 GMT

Hi,

I have contacted experts regarding this and will get back to you soon.

Regards,

Priyanka

RE: How to keep forked repositories updated

HFled — Tue, 25 Jan 2022 14:58:27 GMT

Thanks, but that tutorial doesn't contain anything pertaining to my question afaict.

My question is about how to correctly keep a forked (and modified) downstream repository up to date in the "expected" way eluded to in https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/dm_code_base.html#oss-repositories-downstream-project-history .

Specifically, because of

The downstream project history is periodically rewritten. This is important to prevent the number of downstream patches included in a specific nRF Connect SDK release from increasing forever. A repository’s history is typically only rewritten once for every nRF Connect SDK release.

There are a lot of conflicts when trying to merge (e.g.) sdk-zephyr revision v2.7.0-ncs1 (the current latest release) into v2.6.99-ncs1 (the last release) or in actuality my own version that has some cherry-picks from zephyr upstream on top for critical bugfixes that were not yet released as part of the ncs.

RE: How to keep forked repositories updated

Priyanka — Tue, 25 Jan 2022 14:44:07 GMT

Hi,

You could take a look at this tutorial.

Regards,

Priyanka