Merge with conflicts can be resolved with changes in code that don’t belong to t... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		hinkley 53 days ago \| parent \| context \| favorite \| on: At the end you use `git bisect` Merge with conflicts can be resolved with changes in code that don’t belong to the person who resolved the merge, and are not attributed to the person who resolved the merge. Git blame shows someone else as the person who introduced the bug. When you do a rebase you’re only modifying your own commits, or those of someone sharing your branch.

anonymars 52 days ago [–]

I'd really like to see an example of what you mean. Are you saying a git blame is attributing code to a person who did not write that code?

Are cherry picks involved (which also screw up history)? https://devblogs.microsoft.com/oldnewthing/20180313-00/?p=98...

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact