No Stupid Questions (Developer Edition)

1058 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 !nostupidquestions@lemmy.world

Icon base by Lorc under CC BY 3.0 with modifications to add a gradient

founded 2 years ago

MODERATORS

LinearArray@programming.dev

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

submitted 2 years ago by Ludrol@szmer.info to c/no_stupid_questions@programming.dev

6 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.

top 6 comments

sorted by: hot top controversial new old

[–] emptyother@programming.dev 13 points 2 years 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.

[–] homoludens@feddit.de 4 points 2 years ago

I would merge 2.0 into my branch and fix (and test) the conflict there.

[–] nomecks@lemmy.world 3 points 2 years ago

Force merge your PR and call out their personal issues in the comments

[–] nous@programming.dev 3 points 2 years ago

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.

[–] glad_cat@lemmy.sdf.org 2 points 2 years ago* (last edited 2 years 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.

[–] Ludrol@szmer.info 2 points 2 years ago* (last edited 2 years 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