GithubHelp home page GithubHelp logo

Comments (2)

MarcusOtter avatar MarcusOtter commented on May 17, 2024 1

Guilty 🙋‍♂️ (though I do rebase with my git pulls 😉)
(for reference: withastro/astro#927 and withastro/astro#928)

Use cases:

  • Merge conflict on my pull request, and my fork is a few days behind astro/main. What do? (#928)
  • Feature branch is behind by a few commits of the main branch. What do?
    Usually I would merge the main branch into the feature branch (perhaps with --ff-only)

Seems like merging ends up with very messy pull requests (#927) or a messy commit history? So I guess an overview on the git workflow of this repository makes sense to have in the contribution guidelines. However, fully fledged instructions about specific git features sounds out of scope, we should probably link to the official git docs for that (and maybe some easy-to-understand examples using said features)

from docs.

sarah11918 avatar sarah11918 commented on May 17, 2024 1

I'm going to close this issue, since @delucis is currently putting together some contributing instrutions, I think including mention of the GitHub app "Pull" that people can install to automatically fetch upstream reguarly. Chris, let's take this into consideration when creating a workflow for contributors! If y'all don't like what is produced, we can revisit focused on the new thing. :)

from docs.

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.