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

I've found myself wanting the same thing. Git's diff algorithms are sometimes not as smart as I wish they were. Recently, when merging master into my feature branch, I had an incoming one line change trigger a single diff that was nearly the size of an entire file. That change wasn't even in the same area of the file I had been working on. Being able to walk forward and backwards through the incoming changes would have resolved the issue much faster than comparing "ours" and "theirs" by eye to see what actually changed.


This happens to me regularly with our .csproj files. I'm convinced it has something to do with our line endings...


What triggered the diff? Always trying to learn more Git nonsense.


I merged master into my feature branch. One of my colleagues added a property to a jsx element in the render function of a react component.


Did they re-indent, change line endings, or strip end of line whitespace?




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

Search: