Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Troubleshooting

Dmitry Shevtsov edited this page Mar 17, 2020 · 5 revisions

I have signed the Adobe CLA twice and its check still requires signing it

Sign the Adobe CLA!

No signed agreements were found. ...

Check if you entered your GitHub username correctly. Example solution.

When I run rake update:all, git notifies me that I have to commit something

rake update:all runs git pull on default branches for repositories. Default branches are the branches defined in the Docfile.yml. They are always protected. Direct committing into protected branches are strictly forbidden. And there is a reason for it. When you add a commit to your default branch, you cannot push it, BUT that commit will become a part of your new branch.

When git shows you that there is something wrong after rake update:all, it means that content in your default branch has been changed. You never commit changes to a default branch!

Okay, but I already committed such changes to a default branch

Reset the corresponding default branches in devdocs and subrepositories where you directly added those commit.

On devdocs

git fetch
git checkout master
git reset --hard origin/master

In subrepositories

If you work in subrepositories (any local-only branches, stashes):

cd <directory of a subrepo from Docfile>
git fetch
git checkout <branch from Docfile>
git reset --hard origin/<branch from Docfile>

If you never work with subrepositories:

rake multirepo:reinit

CAUTION: multirepo:reinit will remove all the directories and associated git repositories listed in Docfile.