Both of these merges are on me, I wasn't aware aware that they would show up like this. I personally prefer the format provided by the dev/merge.py script.
Since 2016 Github supports "Rebase and Merge" as a second option when submitting PRs: https://blog.github.com/2016-09-26-rebase-and-merge-pull-requests/ The option is enabled on the parquet-format repository but I don't have access to the project configuration to check whether we can disable the others and make "Rebase and Merge" the default. Apologies for messing up the commit log. Please let me know if you'd like me to clean them up with a force-push. Cheers, Lars On Fri, Mar 23, 2018 at 5:22 AM, Zoltan Ivanfi <z...@cloudera.com> wrote: > Hi, > > Parquet was recently migrated to GitBox (thanks, Uwe!). The dev/merge.py > script can be still used by setting PUSH_REMOTE_NAME=apache-github before > invoking it. There is also a new option of merging changes using the GitHub > web UI. I personally continued using the merge script, while others started > using the GitHub web UI. However, I noticed that the latter results in less > clear commit messages/structure: > > *git log --oneline* | head > 92661a4 Merge pull request #89 from timarmstrong/master > 809edf0 Merge pull request #86 from lekv/p323 > 31a9ddc Update Encodings.md with RLE_DICTIONARY > 4d58831 PARQUET-1236: Align version of slf4j-api > 2667e08 PARQUET-323: Mark INT96 as deprecated > a64a331 PARQUET-1201: Implement page indexes > 9fef1d8 PARQUET-1197: Log rat failures > 6e5b78d PARQUET-1065: Deprecate type-defined sort ordering for INT96 type > 2696f9e PARQUET-1171: Clarify scope of usage for RLE, BIT_PACKED encodings > c6d306d PARQUET-1064: Deprecate type-defined sort ordering for INTERVAL > type. > > *git log --oneline --graph* | head -n 15 > * 92661a4 Merge pull request #89 from timarmstrong/master > |\ > | * 31a9ddc Update Encodings.md with RLE_DICTIONARY > * | 809edf0 Merge pull request #86 from lekv/p323 > |\ \ > | |/ > |/| > | * 2667e08 PARQUET-323: Mark INT96 as deprecated > * | 4d58831 PARQUET-1236: Align version of slf4j-api > |/ > * a64a331 PARQUET-1201: Implement page indexes > * 9fef1d8 PARQUET-1197: Log rat failures > * 6e5b78d PARQUET-1065: Deprecate type-defined sort ordering for INT96 type > * 2696f9e PARQUET-1171: Clarify scope of usage for RLE, BIT_PACKED > encodings > * c6d306d PARQUET-1064: Deprecate type-defined sort ordering for INTERVAL > type. > > I would like to ask the developer community: What do you think about the > commits resulting from merging using the GitHub web UI? Are we fine with > these or should we come up with some a policy about how to merge? > > Thanks, > > Zoltan >
