Git Product home page Git Product logo

Comments (4)

aiurovet avatar aiurovet commented on September 25, 2024 1

Yes, that worked!
Thank you very much for the quick response and advice.

from add-and-commit.

EndBug avatar EndBug commented on September 25, 2024

Since v8, the action doesn't run git pull by default. You can change to the previous behavior by using setting pull: --rebase in your inputs

from add-and-commit.

aiurovet avatar aiurovet commented on September 25, 2024

Thank you, @EndBug. I did as you advised, but got an error on the first target (ubuntu-latest):

Error: Error: error: cannot pull with rebase: Your index contains uncommitted changes.

I guess, this is because the produced binaries are part of the version control. The rest was committed and pushed to trigger the CI (build). But again, everything worked in v7.

Should I use add: 'app/${{runner.os}}/* --force --rebase' instead of pull: --rebase?

from add-and-commit.

EndBug avatar EndBug commented on September 25, 2024

Well, you can't use --rebase on git add, so that's a no for sure...
I think this relates to issue #492: it's a bit tricky to find a solution that works for every scenario, and the current is for sure not the best one...

It's a bit of a workaround, but why don't you try manually pulling before the action?

- run: git pull
- uses: EndBug/add-and-commit@v9
  with:
    add: # ...

To be honest, concurrency it's something this project was never great to handle: it's for sure something to improve in the future

from add-and-commit.

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.