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

[email protected]

What should I do in this situation? git best practices. (szmer.info)

submitted 1 year ago by [email protected] to c/[email protected]

11 comments fedilink hide all child comments

drawing showing git history made in gimp

So I have a bug fix (green) and owner also made a bug fix (red) but I would like to rework both of them due to discussion we had. I have opened a PR and there is merge conflict that can't be resolved. Should I open a new branch in my fork and close PR or should I google some rebase magic to apply commits to my bug-fix branch.

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 3 points 1 year ago* (last edited 1 year ago)

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.