search

aristanetworks / avd-workshops

Arista Automation Workshop
https://aristanetworks.github.io/avd-workshops/
18 stars 24 forks source link

Docs(CICD): Add a note to assist user to fix below error when merging origin/cicd-ff branch #111

Closed mthiel117 closed 10 months ago

mthiel117 commented 11 months ago

When user tries to merge the branch below, they receive this error because they forgot to uncheck copy the main branch only when forking the repo.

git merge origin/cicd-ff

Error Message:

merge: origin/cicd-ff - not something we can merge

Steps to fix the issue without re-forking the repo. This is useful if running a virtual workshop and users are having issues.

git remote add upstream https://github.com/aristanetworks/ci-workshops-avd.git
git fetch upstream
git merge upstream/cicd-ff