help to merge TRAFODION-1743

["Ma, Sheng-Chen (Aven)" <sh...@esgyn.cn>]

Hi all:

this jira had been merged in #561<https://github.com/apache/incubator-trafodion/pull/561>, but it is strange the changed code disappeared in apache/master. So I do a PR again.
Can someone help to merge again.


Thanks
Aven

答复: help to merge TRAFODION-1743

["Ma, Sheng-Chen (Aven)" <sh...@esgyn.cn>]

Hi Steve:
Thanks very much for your explain. Now I know what's wrong with this.
I am not good at git previous , I just create a new branch from my local master, I think it's the reason.
The good way is create a new branch from apache/master.(now I do this)

And I have created a new PR.

Thanks
Aven


-----邮件原件-----
发件人: Steve Varnau [mailto:steve.varnau@esgyn.com] 
发送时间: 2016年8月2日 0:49
收件人: dev@trafodion.incubator.apache.org
主题: RE: help to merge TRAFODION-1743

Hi Aven,

This seems to be a git merge problem between your branches.  On PR 568, there were lots of commits involved, including commit 42be08ac455 which was a merge that included commit 1f0e8a3, which is the last commit in PR 561.

So as far as git records, PR 561 was merged into 568.  So when 568 was merged into master, ASF automation also marked 561 as merged.  Usually it is a good idea to keep the PR content separate, but git merge shows it as combined.

However, looking at the merge commit, the CONTENT of PR561 was not actually included.  So it looks to git as if it is intentionally left out.


It is a bit complicated, so I hope I am explaining it clearly. The result is that PR561 was never approved and merged, but it was marked as merged, with the content removed.  I think you tried to keep PR561 out of PR568, but did not realize it still recorded the merge between branches.

To straighten this out, I think you need a new branch with this missing content and create a new PR.

--Steve

> -----Original Message-----
> From: Ma, Sheng-Chen (Aven) [mailto:shengchen.ma@esgyn.cn]
> Sent: Monday, August 1, 2016 3:36 AM
> To: dev@trafodion.incubator.apache.org
> Subject: help to merge TRAFODION-1743
>
> Hi all:
>
> this jira had been merged in #561<https://github.com/apache/incubator-
> trafodion/pull/561>, but it is strange the changed code disappeared in 
> apache/master. So I do a PR again.
> Can someone help to merge again.
>
>
> Thanks
> Aven

RE: help to merge TRAFODION-1743

[Steve Varnau <st...@esgyn.com>]

Hi Aven,

This seems to be a git merge problem between your branches.  On PR 568,
there were lots of commits involved, including commit 42be08ac455 which
was a merge that included commit 1f0e8a3, which is the last commit in PR
561.

So as far as git records, PR 561 was merged into 568.  So when 568 was
merged into master, ASF automation also marked 561 as merged.  Usually it
is a good idea to keep the PR content separate, but git merge shows it as
combined.

However, looking at the merge commit, the CONTENT of PR561 was not
actually included.  So it looks to git as if it is intentionally left out.


It is a bit complicated, so I hope I am explaining it clearly. The result
is that PR561 was never approved and merged, but it was marked as merged,
with the content removed.  I think you tried to keep PR561 out of PR568,
but did not realize it still recorded the merge between branches.

To straighten this out, I think you need a new branch with this missing
content and create a new PR.

--Steve

> -----Original Message-----
> From: Ma, Sheng-Chen (Aven) [mailto:shengchen.ma@esgyn.cn]
> Sent: Monday, August 1, 2016 3:36 AM
> To: dev@trafodion.incubator.apache.org
> Subject: help to merge TRAFODION-1743
>
> Hi all:
>
> this jira had been merged in #561<https://github.com/apache/incubator-
> trafodion/pull/561>, but it is strange the changed code disappeared in
> apache/master. So I do a PR again.
> Can someone help to merge again.
>
>
> Thanks
> Aven