undefined | Better HN

0 pointsrevskill4y ago0 comments

Not quite. We have a workflow to resolve conflict though. All needed is just git merge, git pull. You need workflow, not git rebase.

0 comments

A lot of very smart people disagree with you.

Then you must have never used "git bisect"? Or only bisect on the first parent?

j / k navigate · click thread line to collapse

0 pointsrevskill4y ago0 comments

Not quite. We have a workflow to resolve conflict though. All needed is just git merge, git pull. You need workflow, not git rebase.

A lot of very smart people disagree with you.

Then you must have never used "git bisect"? Or only bisect on the first parent?

j / k navigate · click thread line to collapse