Re: Git branching structure: ff or no-ff - Mailing list pgsql-jdbc

Hi,

Any clue why --no-ff merges are used a lot in pgjdbc development?
Any clue why "fix here, fix there" commits are not squashed before integration?

From my point of view, it makes history browsing hard:
1) Just look at https://github.com/pgjdbc/pgjdbc/commits/master
Commits on Jul 9, 2015
Merge pull request #333 from zapov/master …
Merge pull request #343 from phillipross/master …
Merge pull request #351 from headcrashing/#328 …
Merge pull request #349 from ekoontz/jsonb-support …
...
Does that make much sense?

2) Even a single commit becomes two commits, so it clutters change log

3) It looks odd to have all those "fix here, fix there" commits in the
final history: https://github.com/pgjdbc/pgjdbc/pull/343/commits


What everyone thinks on that?

http://endoflineblog.com/gitflow-considered-harmful
http://endoflineblog.com/follow-up-to-gitflow-considered-harmful
https://news.ycombinator.com/item?id=9745966

--
Regards,
Vladimir Sitnikov


--
Sent via pgsql-jdbc mailing list (pgsql-jdbc@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-jdbc