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

LinearArray

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

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

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

[–] emptyother 13 points 1 year ago

If the merge is really too complicated to easily resolve, drop the PR. Then you can pull in latest and make the fix anew. Don't delete your old PR's branch yet, you might want to look up how you did your original fix.