News for hackers. Stuff that matters.
Re:GitFlow considered harmful by geertj on Friday June 19, 2015 @01:30PM (#9746345)
> Rewriting shared history is (almost) always bad.

Agreed. The one counterexample that I have is Github pull requests. Those are actually branches in your fork, and you do want to rewrite those when you get feedback on a pull request. That makes it easier for the owner of the repo to do the merge later.

Re:GitFlow considered harmful by clinta on Friday June 19, 2015 @04:53PM (#9747619)
Why do you need to rewrite? If a pull request is not completed, you can continue to push it and the PR is updated to pull the latest commit.
Re:GitFlow considered harmful by sorbits on Friday June 19, 2015 @05:11PM (#9747702)
I will get pull requests where later commits fix bugs introduced in former commits.

I generally ask people to rewrite such PRs, as I’m not going to pull known buggy commits into master, even if they are followed by fixes. That is just noise.

It might also be that some commits in the PR has changed tabs to spaces or vice versa.

Re:GitFlow considered harmful by hayd on Friday June 19, 2015 @07:48PM (#9748348)
I think the point was: if you have a PR with two commits, you can squash it to a single commit and force push. This will update the PR to just have the single commit. (Similarly with a rebase.)
Re:GitFlow considered harmful by RickHull on Friday June 19, 2015 @09:07PM (#9748531)
sorbits' point was in response to:

clinta > Why do you need to rewrite? If a pull request is not completed, you can continue to push it and the PR is updated to pull the latest commit.

sorbits is saying that no, you really should rewrite your PR.

You, hayd, seem to be merely reiterating sorbits' point.