Giter VIP home page Giter VIP logo

Comments (5)

Smit-create avatar Smit-create commented on July 17, 2024 1

@oyamad @mmcky Should I revert the PR and complete it in one go? such that we don't have any conflicts and merge it on priority?

from quantecon.py.

Smit-create avatar Smit-create commented on July 17, 2024 1

I checked by merging #674 into a copy of main branch in my fork and found that the commit history is not overridden, i.e., it uses the same old commits: https://github.com/Smit-create/QuantEcon.py/tree/check_671_merge

Another solution that I found is this:

  1. Revert PR #601 and merge it in the main.
  2. Merge #674 into the main and you can see the results as expected. This is how it would look: https://github.com/Smit-create/QuantEcon.py/commits/check_671_5/quantecon/_arma.py

from quantecon.py.

Smit-create avatar Smit-create commented on July 17, 2024

I tried to save the commit history to the new file using git mv. I see that the reason it got lost is due to merge conflicts and when I resolved those conflicts manually, it somehow got messed up. I will try to look into this.

from quantecon.py.

Smit-create avatar Smit-create commented on July 17, 2024

One option is that we can revert that PR and then I'll come up with a new PR fixing that in one go such that we don't have any merge conflicts.

from quantecon.py.

oyamad avatar oyamad commented on July 17, 2024

Resolved by #682

from quantecon.py.

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.