this post was submitted on 09 Sep 2023
11 points (100.0% liked)
No Stupid Questions (Developer Edition)
929 readers
1 users here now
This is a place where you can ask any programming / topic related to the instance questions you want!
For a more general version of this concept check out [email protected]
Icon base by Lorc under CC BY 3.0 with modifications to add a gradient
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
I'd pull their main, rebase your 2.0 to theirs and then rebase your fix to your 2.0. Then you should have a better view on what has changed between those two. It'll probably result in you cherry picking from your fix.