reef-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sergiy Matusevych <sergiy.matusev...@gmail.com>
Subject Re: Commit history
Date Wed, 29 Mar 2017 17:16:54 GMT
Oh crap I did not check what I pushed into apache master. :( I can
force push a rebased commit to fix it.

To prevent such errors in the future, we can write git hooks to check if
each commit conforms to a certain format and require all REEF committers to
use them.

-- Sergiy.

On Wed, Mar 29, 2017 at 10:09 AM, Markus Weimer <markus@weimo.de> wrote:

> Hi,
>
> a recent PR seems to not have been squashed cleanly. `git log` looks like
> this:
>
> ```
> commit 96725fa7719d4c1bd020c1a6acdffee735af6479
> Merge: 7e0f408 a21aa3c
> Author: Sergiy Matusevych <motus@apache.org>
> Date:   Fri Mar 24 13:46:58 2017 -0700
>
>     Merge branch 'REEF-1753' of github.com:taegeonum/incubator-reef
> into REEF-1753
>
> commit a21aa3c0317b933387ca73e721e313e23bbb25c6
> Author: taegeonum <taegeonum@gmail.com>
> Date:   Fri Mar 24 09:45:40 2017 +0900
>
>     Add a comment
>
> commit 3df726738abe66fea090fdce198d8bc445c4c8cb
> Author: taegeonum <taegeonum@gmail.com>
> Date:   Thu Mar 23 15:07:01 2017 +0900
>
>     [REEF-1753] Intermittent failures of CloseEvaluatorTest in local
> runtime
> ```
>
> I suggest we live with it and don't squash now that it is in `master`,
> but it would be good to know why this happened and how we can prevent
> it in the future.
>
> Thanks,
>
> Markus
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message