this post was submitted on 09 Sep 2023
11 points (100.0% liked)
No Stupid Questions (Developer Edition)
947 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 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
It depends - as with any real answer to a problem. I would likely start with a rebase of you bug-fix on 2.0, resolve any conflicts that might have. If there are multiple commits on bug-fix I might squash them to make the merge easier. But if the conflicts are too complex to really resolve it might be easier and quicker to just redo the work in a new branch if the changes are not that big.
Which was is better for you depends on how big those merge conflicts are. But it seems like a good opportunity to learn how to rebase and how to resolve merge conflicts.