| From: | Sehrope Sarkuni <sehrope(at)jackdb(dot)com> |
|---|---|
| To: | Dave Cramer <pg(at)fastcrypt(dot)com> |
| Cc: | Markus KARG <markus(at)headcrashing(dot)eu>, List <pgsql-jdbc(at)postgresql(dot)org> |
| Subject: | Re: Git branching structure: ff or no-ff |
| Date: | 2015-07-20 22:19:44 |
| Message-ID: | CAH7T-ar1_ZKco7q32japt8+8HnHudKurAVHsaLS+OZ4qG5EuQQ@mail.gmail.com |
| Views: | Whole Thread | Raw Message | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-jdbc |
+1 to squashing commits for PRs prior to merging them. The "fix blah"
commits make it difficult to figure the full contents of the PR and
arguably nobody cares about the sausage factory aspect of it. If there's an
actual fix to something broken in a PR then it's a separate PR anyway.
I'm neutral on the no-ff merge commit for PRs. It's really convenient to
click to merge from the GitHub web UI and it gives decent place to put the
PR reference # (which I think GitHub autopopulates for you). Otherwise the
original PR author has to create the PR, then update it again to add the
"PR # blah" line in their own commit. Not a ton of work but anything
circular like that is annoying.
Regards,
-- Sehrope Sarkuni
Founder & CEO | JackDB, Inc. | https://www.jackdb.com/
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Glenn Holmer | 2015-07-21 12:17:38 | documentation download |
| Previous Message | Dave Cramer | 2015-07-20 20:19:15 | Re: Git branching structure: ff or no-ff |