You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I have no problem in doing autoproj switch_config branch=<branch>.
But when I try to do autoproj switch_config tag=<tag> I usually get the following error:
autoproj main configuration(<project>/autoproj): failed in import phase
the local branch 'master' and the remote branch master of autoproj main configuration have diverged, and I therefore refuse to update automatically. Go into <project>/autoproj and either reset the local branch or merge the remote changes
Afterwards, I can do aup --reset and it seems to work without a problem (the local master branch is on the tag).
The tag in the buildconf (<project>/autoproj) just contains a snapshot of the state of the packages.
I have no problem in doing git merge <tag> from the master branch
Not sure if this is the proper solution, but would be possible to have a --force flag in switch_config to avoid this error?
The text was updated successfully, but these errors were encountered:
I have no problem in doing
autoproj switch_config branch=<branch>
.But when I try to do
autoproj switch_config tag=<tag>
I usually get the following error:Afterwards, I can do
aup --reset
and it seems to work without a problem (the local master branch is on the tag).The tag in the buildconf (
<project>/autoproj
) just contains a snapshot of the state of the packages.I have no problem in doing
git merge <tag>
from the master branchNot sure if this is the proper solution, but would be possible to have a
--force
flag in switch_config to avoid this error?The text was updated successfully, but these errors were encountered: