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

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

there is merge conflict that can’t be resolved

Why? That's the main question.

Also https://trunkbaseddevelopment.com/branch-for-release/ says that you should:

fix on your branch
PR to master
cherry pick to 2.0

owner also made a bug fix

That's a political issue, not a technical issue. You MUST talk with the owner about it.

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

Why?

merge resolution would produce more work than opening new PR (couple dozen of lines of code)[I want to learn on small mistakes not on big ones] I would like to rework the owners bug fix to have cleaner code.

Political issue

So I should make a consensus on „Who should make the work?” and „How should feature be implemented?”.

Sadly „2.0” is the trunk and „master” is 1.0 release but thanks for the link