Phabricator – GitHub Alternative written in PHP used by the Wikimedia Foundation

Re:Phabricator – GitHub Alternative written in PHP used by t... by u801e on Wednesday June 06, 2018 @09:44PM (#17252601)

> Before you merge a feature branch, you can squeeze all its commits into one. That leads to a pretty history too.

With Github, you'll end up with a history like:

    Implement feature A
    Merge #1 Implement feature A
    Implement feature B
    Merge #2 Implement feature B
    ...

you basically end up with twice as many commits than you would otherwise. The other problem is that each commit ends up being rather big and the commit message is a combination of all the commits that were squashed, including ones that don't really contain any useful information (e.g., "Addressing comments").

A big commit is harder to revert (without encountering conflicts).

[ Parent | on HN ]

Re:Phabricator – GitHub Alternative written in PHP used by t... by unfunco on Thursday June 07, 2018 @03:58AM (#17254080)

Use squash and merge instead. It's built right into GitHub, that way your history will look like:

    Implement feature A
    Implement feature B

[ Parent | on HN ]

Re:Phabricator – GitHub Alternative written in PHP used by t... by u801e on Thursday June 07, 2018 @11:45AM (#17256853)

In either case, you end up with commits that have large diffs and touch many parts of the code base. Most features require multiple commits to implement. As far as I know, Github does not provide a facility to squash into multiple commits.

[ Parent | on HN ]