search

jmoalves / levain

Something to help you make your software grow
MIT License
8 stars 5 forks source link

GitRepository - The first git pull after a change raises an error #88

Closed jmoalves closed 3 years ago

jmoalves commented 3 years ago

The git pull refuses to complete. It works fine if we run the levain shell again.

$ git pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (6/6), 554 bytes | 13.00 KiB/s, done.
fatal: Not possible to fast-forward, aborting.
$ git pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories
remote: Total 0 (delta 0), reused 0 (delta 0)
jmoalves commented 3 years ago

git pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories --no-commit

jmoalves commented 3 years ago

The problem persists

fatal: Not possible to fast-forward, aborting.
jmoalves commented 3 years ago

We should retry the git pull command

jmoalves commented 3 years ago

git pull retries 3 times

jmoalves commented 3 years ago 
-- GIT - PULL - c:\dev-env\.levain\gitRepos\bnd-levain-pkg
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0), pack-reused 0
git error - Error 1 running "cmd /u /c pushd c:\dev-env\.levain\gitRepos\bnd-levain-pkg && C:\src\github\levain\extra-bin\windows\git\cmd\git.exe pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories --no-commit && popd"
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
git error - Error 128 running "cmd /u /c pushd c:\dev-env\.levain\gitRepos\bnd-levain-pkg && C:\src\github\levain\extra-bin\windows\git\cmd\git.exe pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories --no-commit && popd"
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
git error - Error 128 running "cmd /u /c pushd c:\dev-env\.levain\gitRepos\bnd-levain-pkg && C:\src\github\levain\extra-bin\windows\git\cmd\git.exe pull --force -q --progress --no-tags --depth=1 --update-shallow --allow-unrelated-histories --no-commit && popd"