this post was submitted on 04 Dec 2024
174 points (91.8% liked)
Open Source
31654 readers
236 users here now
All about open source! Feel free to ask questions, and share news, and interesting stuff!
Useful Links
- Open Source Initiative
- Free Software Foundation
- Electronic Frontier Foundation
- Software Freedom Conservancy
- It's FOSS
- Android FOSS Apps Megathread
Rules
- Posts must be relevant to the open source ideology
- No NSFW content
- No hate speech, bigotry, etc
Related Communities
Community icon from opensource.org, but we are not affiliated with them.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
How do you cleanly base your local changes against a new upstream version? Merges?
You merge from them. If you're working on a PR, they can always squash merge your commits if you have a lot of them. No history rewriting required.