You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@reef.apache.org by Markus Weimer <ma...@weimo.de> on 2015/07/28 01:46:16 UTC
Heal merge commit?
Hi,
there has been a snafu with merging [REEF-440]. The commit log reads:
```
commit cd91f6312c3bbca7052f9408712acb97ed8e7ec8
Merge: 5c897d5 47b3ad7
Author: Beysim Sezgin <be...@hotmail.com>
Date: Mon Jul 27 15:42:32 2015 -0700
Merge branch 'REEF-440' of
https://github.com/tcNickolas/incubator-reef into REEF-440
commit 5c897d534a7e3fb29d075a8253f41e4a9fb3e54d
Author: Mariia Mykhailova <mi...@gmail.com>
Date: Mon Jul 20 14:53:02 2015 -0700
[REEF-440] Enforce checkstyle checks in "Naming" category
commit 037866c683c771786e7b4e3fdb85b903f4a349be
Author: Andrew Chung <af...@gmail.com>
Date: Fri Jul 24 22:52:46 2015 -0700
[REEF-426] YARN reports success even though REEF job failed
commit 47b3ad7211dcbd51367f27f9966da9a543bcb495
Author: Mariia Mykhailova <mi...@gmail.com>
Date: Mon Jul 20 14:53:02 2015 -0700
[REEF-440] Enforce checkstyle checks in "Naming" category
```
This is still in very recent history. Shall we try to heal it by
force-pushing into apache master? Or live with it and move on?
Markus
Re: Heal merge commit?
Posted by Markus Weimer <ma...@weimo.de>.
Let's leave it in then.
Markus, proceeding to more merges.
On 2015-07-27 19:14, Byung-Gon Chun wrote:
> +1
>
> Sent from my iPhone
>
> 2015. 7. 28. 오전 10:42 Brian Cho <ch...@gmail.com> 작성:
>
>> +1, the confusion in the log seems small compared to the potential for
>> headache (e.g., if we get merge conflicts across our active branches). It
>> seems safe, but there’s really no quick, safe way to try it out either.
>>
>>> On Tue, Jul 28, 2015 at 10:38 AM, Markus Weimer <ma...@weimo.de> wrote:
>>>
>>>> On 2015-07-27 18:26, Brian Cho wrote:
>>>> It looks like a “blank” commit — there’s no diff between cd91.. and
>>>> 5c89… I believe we can safely force-push to remove the commit if we
>>>> act soon. But I’m really not an expert here.
>>>
>>> Me neither. Maybe it is safest to live with it. If there is ever
>>> confusion about REEF-440, let's hope the search also finds this thread.
>>>
>>> Markus
>>>
Re: Heal merge commit?
Posted by Byung-Gon Chun <bg...@gmail.com>.
+1
Sent from my iPhone
2015. 7. 28. 오전 10:42 Brian Cho <ch...@gmail.com> 작성:
> +1, the confusion in the log seems small compared to the potential for
> headache (e.g., if we get merge conflicts across our active branches). It
> seems safe, but there’s really no quick, safe way to try it out either.
>
>> On Tue, Jul 28, 2015 at 10:38 AM, Markus Weimer <ma...@weimo.de> wrote:
>>
>>> On 2015-07-27 18:26, Brian Cho wrote:
>>> It looks like a “blank” commit — there’s no diff between cd91.. and
>>> 5c89… I believe we can safely force-push to remove the commit if we
>>> act soon. But I’m really not an expert here.
>>
>> Me neither. Maybe it is safest to live with it. If there is ever
>> confusion about REEF-440, let's hope the search also finds this thread.
>>
>> Markus
>>
Re: Heal merge commit?
Posted by Brian Cho <ch...@gmail.com>.
+1, the confusion in the log seems small compared to the potential for
headache (e.g., if we get merge conflicts across our active branches). It
seems safe, but there’s really no quick, safe way to try it out either.
On Tue, Jul 28, 2015 at 10:38 AM, Markus Weimer <ma...@weimo.de> wrote:
> On 2015-07-27 18:26, Brian Cho wrote:
> > It looks like a “blank” commit — there’s no diff between cd91.. and
> > 5c89… I believe we can safely force-push to remove the commit if we
> > act soon. But I’m really not an expert here.
>
> Me neither. Maybe it is safest to live with it. If there is ever
> confusion about REEF-440, let's hope the search also finds this thread.
>
> Markus
>
Re: Heal merge commit?
Posted by Markus Weimer <ma...@weimo.de>.
On 2015-07-27 18:26, Brian Cho wrote:
> It looks like a “blank” commit — there’s no diff between cd91.. and
> 5c89… I believe we can safely force-push to remove the commit if we
> act soon. But I’m really not an expert here.
Me neither. Maybe it is safest to live with it. If there is ever
confusion about REEF-440, let's hope the search also finds this thread.
Markus
Re: Heal merge commit?
Posted by Brian Cho <ch...@gmail.com>.
It looks like a “blank” commit — there’s no diff between cd91.. and 5c89… I
believe we can safely force-push to remove the commit if we act soon. But
I’m really not an expert here.
-Brian
On Tue, Jul 28, 2015 at 8:46 AM, Markus Weimer <ma...@weimo.de> wrote:
> Hi,
>
> there has been a snafu with merging [REEF-440]. The commit log reads:
>
> ```
> commit cd91f6312c3bbca7052f9408712acb97ed8e7ec8
> Merge: 5c897d5 47b3ad7
> Author: Beysim Sezgin <be...@hotmail.com>
> Date: Mon Jul 27 15:42:32 2015 -0700
> Merge branch 'REEF-440' of
> https://github.com/tcNickolas/incubator-reef into REEF-440
>
> commit 5c897d534a7e3fb29d075a8253f41e4a9fb3e54d
> Author: Mariia Mykhailova <mi...@gmail.com>
> Date: Mon Jul 20 14:53:02 2015 -0700
> [REEF-440] Enforce checkstyle checks in "Naming" category
>
> commit 037866c683c771786e7b4e3fdb85b903f4a349be
> Author: Andrew Chung <af...@gmail.com>
> Date: Fri Jul 24 22:52:46 2015 -0700
> [REEF-426] YARN reports success even though REEF job failed
>
> commit 47b3ad7211dcbd51367f27f9966da9a543bcb495
> Author: Mariia Mykhailova <mi...@gmail.com>
> Date: Mon Jul 20 14:53:02 2015 -0700
> [REEF-440] Enforce checkstyle checks in "Naming" category
> ```
>
> This is still in very recent history. Shall we try to heal it by
> force-pushing into apache master? Or live with it and move on?
>
> Markus
>