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

For the conflicts, note that in Git you can do

    git config --global merge.conflictstyle diff3
to get something like what is shown in the article.


This should be the default.

Nearly every time I see a complaint about git, someone comes through with a command like this. Is there a collection of similar tips that makes git better to use? If not, there should be.




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

Search: