It's much easier to understand linear upstream history! Also, with this script y... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

cryptonector on March 5, 2020 | parent | context | favorite | on: Please stop recommending Gitflow

It's much easier to understand linear upstream history!

Also, with this script you get to see which of your commits is conflicting with which upstream commits. That's really important information to me.

stavros on March 5, 2020 [–]

I'll give it a shot next time I have conflicts, thanks.

cryptonector on March 5, 2020 | [–]

You're welcome. Leave a comment on the gist about how it goes, if you remember!

I'd really like git to have this feature built-in to it...

Consider applying for YC's Fall 2025 batch! Applications are open till Aug 4
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact