Comments (2)
Guilty 🙋♂️ (though I do rebase with my git pull
s 😉)
(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.
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)
- Add Bun to the Package Manager Tabs across the docs HOT 2
- Integrations with a broken link (a typo in the url) HOT 3
- Blog posts with broken links HOT 1
- astro.build/db extremely laggy in mobile Firefox 123.1.0 HOT 2
- Proposal to reorder Astro DB documentation sections for improved flow
- ⚠️ Issue // getting error at buildtime while using the sitemap integration. HOT 4
- Guide on font preloading HOT 3
- Document that `compressHTML` doesn't remove all whitespace HOT 7
- Authorized remote images are not optimized in Markdown HOT 2
- Astro check command missing flags HOT 1
- @astrojs/tailwind docs don't cover important use-cases with postcss etc HOT 2
- context.locals or locals? HOT 4
- Incorrect remote markdown example HOT 1
- There's a little problem with the layout here.
- Imports guide recommends a buggy use of `import.meta.url`
- Fixing Data Insertion Type Mismatch in Astro DB Table Definitions HOT 1
- Getting validation error "Property view-transition-name doesn't exist" with ViewTransitions HOT 1
- Little problem in the `guides/images` file HOT 2
- Consider clarifying data fetching page HOT 6
- cloudflare import.meta.env docs unclear HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
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.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from docs.