| From: | Vladimir Sitnikov <sitnikov(dot)vladimir(at)gmail(dot)com> |
|---|---|
| To: | List <pgsql-jdbc(at)postgresql(dot)org> |
| Subject: | Git branching structure: ff or no-ff |
| Date: | 2015-07-19 02:05:56 |
| Message-ID: | CAB=Je-FbiLB9Yby9OpgpTPLsoQCkRF5J_633g-z6jHL_LPxaxg@mail.gmail.com |
| Views: | Whole Thread | Raw Message | Download mbox | Resend email |
| Thread: | |
| Lists: | 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
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Dave Cramer | 2015-07-20 16:13:33 | Re: Git branching structure: ff or no-ff |
| Previous Message | Luca Ferrari | 2015-07-17 07:55:07 | Re: supporting any/all connection types including unix domain sockets |