GithubHelp home page GithubHelp logo

Comments (4)

abelsiqueira avatar abelsiqueira commented on July 28, 2024

Maybe relates to #676

from tulipaenergymodel.jl.

gnawin avatar gnawin commented on July 28, 2024

@clizbe I have my fork named "fork", and the remote named "upstream", as this is easier for me. The naming seems to me is just a user choice. So, as you've shown, you can even have two names for the remote, didn't know that before...

from tulipaenergymodel.jl.

clizbe avatar clizbe commented on July 28, 2024

I think the difference is that you keep your personal remote fork (gnawin/TEM) up to date and fetch/pull from there. Whereas I fetch from the main remote repo (TulipaEnergy/TEM) and my fork is completely behind, but I push my branches there before making a PR. They're about the same, it just depends if you pull your updates from your own fork or the main repo. If you pull from your own fork you have to keep it up to date as well. 🤔

But I could be totally wrong - I think upstream is where your default fetch is from.

from tulipaenergymodel.jl.

gnawin avatar gnawin commented on July 28, 2024

I think the difference is that you keep your personal remote fork (gnawin/TEM) up to date and fetch/pull from there. Whereas I fetch from the main remote repo (TulipaEnergy/TEM) and my fork is completely behind, but I push my branches there before making a PR. They're about the same, it just depends if you pull your updates from your own fork or the main repo. If you pull from your own fork you have to keep it up to date as well. 🤔

But I could be totally wrong - I think upstream is where your default fetch is from.

Yeah, it just depends on where you pull your updates from. In readme.dev, it says
git merge --ff-only origin/main. In my case, I just changed my remote name to upstream because I don't like origin, so my own workflow is git merge --ff-only upstream/main 😄 . So our workflows are the same, just with different names for the remote (meaning that my fork is also very much behind).

from tulipaenergymodel.jl.

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.