[agl-dev-community] Heads up re next branch rebasing

["Scott Murray" <scott.murray@xxxxxxxxxxxx>]

Just a quick heads up, I've rebased the next branches in AGL-repo and the
meta-agl* repositories to pick up recent changes from master.  The rebase
in AGL-repo may require manual intervention if you already have a local
tree using the next branch.  If you do and "repo sync" complains about a
merge issue in .repo/manifests, try aborting the merge and then doing:

git checkout gerrit/master
git branch -D default
git checkout -b default origin/next

in .repo/manifests, that got me back onto the rebased next branch here.
Alternatively, you can make a clean tree in another directory with "repo
init" and "repo sync" and move your build directory over to it.

Scott


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#8264): https://lists.automotivelinux.org/g/agl-dev-community/message/8264
Mute This Topic: https://lists.automotivelinux.org/mt/73184301/2167316
Group Owner: agl-dev-community+owner@xxxxxxxxxxxxxxxxxxxxxxxxx
Unsubscribe: https://lists.automotivelinux.org/g/agl-dev-community/leave/4543822/883735764/xyzzy  [list-automotive-discussions82@xxxxxxxxxxx]
-=-=-=-=-=-=-=-=-=-=-=-