FAQ - Frequently Asked Questions

From Ronetix's Wiki
Revision as of 10:01, 22 January 2024 by Ilko (talk | contribs) (Update)
Jump to navigation Jump to search

How to rebase the Ronetix U-BOOT git repository?

Here are the steps to rebase the U-BOOT repository: 

$ git clone https://github.com/ronetix/u-boot.git
$ cd u-boot
$ git remote add nxp https://github.com/nxp-imx/uboot-imx.git 
$ git fetch nxp
$ git checkout remotes/origin/lf_v2023.04 -b lf_v2023.04
$ git rebase nxp/lf_v2023.04

If there are some conflicts, resolve them manually, for example: 

$ vim arch/arm/mach-imx/imx9/Kconfig # fix and save
$ git add arch/arm/mach-imx/imx9/Kconfig
$ git commit -m "mach-imx/imx9/Kconfig : resolve merge conflict"
$ git rebase --continue
Retrieved from "http://wiki.ronetix.at/index.php?title=FAQ_-_Frequently_Asked_Questions&oldid=384"