Re: Git branching structure: ff or no-ff
| От | Dave Cramer |
|---|---|
| Тема | Re: Git branching structure: ff or no-ff |
| Дата | |
| Msg-id | CADK3HHK4nkzsMnPpqTjkWFzizLMc=7mPMaRK6xR0en5F6P3wkw@mail.gmail.com обсуждение исходный текст |
| Ответ на | Git branching structure: ff or no-ff (Vladimir Sitnikov <sitnikov.vladimir@gmail.com>) |
| Ответы |
Re: Git branching structure: ff or no-ff
Re: Git branching structure: ff or no-ff |
| Список | pgsql-jdbc |
The answer to your question(s) is mostly ignorance.
Is there a way to fix the previous commits ?
On 18 July 2015 at 22:05, Vladimir Sitnikov <sitnikov.vladimir@gmail.com> wrote:
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
В списке pgsql-jdbc по дате отправления: