Giter VIP home page Giter VIP logo

Comments (2)

flybyray avatar flybyray commented on July 28, 2024

With --manual merge. I debugged with a loop like this to break on merges or loop when the lfs file appears.

while true
do
  git log files/yq_linux_amd64.tar.gz || git imerge continue || break
  sleep 1
done

When I received a point when the file exists in git log hit Ctrl-C.
Then i debugged with python trace module and found that this command returns error 1.
'git' 'diff-index' '--cached' '--quiet' '--ignore-submodules' 'HEAD' '--'

When executed manually without --quiet I see this output:

:100644 000000 36fabf0fed23a65d043807e75e161f6072f3b15a 0000000000000000000000000000000000000000 D    files/yq_linux_amd64.tar.gz

I think this is correct and a bug in git imerge because this is a staged file ( deleted ) and I would expect git imerge continue would operate as normal.

$ git status --verbose
On branch imerge/feature/OPS-587
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        deleted:    files/yq_linux_amd64.tar.gz

diff --git a/files/yq_linux_amd64.tar.gz b/files/yq_linux_amd64.tar.gz
deleted file mode 100644
index 36fabf0f..00000000
Binary files a/files/yq_linux_amd64.tar.gz and /dev/null differ

from git-imerge.

flybyray avatar flybyray commented on July 28, 2024

I think I had an usage error here. Started from beginning again.
And i think the essential thing was to just remove the file from index ( git rm --cached files/yq_linux_amd64.tar.gz ) and put it into .gitignore file than stage them. afterwards git imerge continue worked as expected.

from git-imerge.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.