<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta name=Generator content="Microsoft Word 14 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.E-MailFormatvorlage17
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=DE link=blue vlink=purple><div class=WordSection1><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D'><o:p> </o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D'><o:p> </o:p></span></p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span style='font-size:10.0pt;font-family:"Tahoma","sans-serif"'>From:</span></b><span style='font-size:10.0pt;font-family:"Tahoma","sans-serif"'> Isaac Bennetch [mailto:bennetch@gmail.com] <br><b>Sent:</b> Friday, May 17, 2013 5:12 AM<br><b>To:</b> phpmyadmin-devel@lists.sourceforge.net<br><b>Subject:</b> Re: [Phpmyadmin-devel] Double-checking a commit<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><div><div><p class=MsoNormal><o:p> </o:p></p><div><p class=MsoNormal>On Thu, May 16, 2013 at 4:31 PM, Isaac Bennetch <<a href="mailto:bennetch@gmail.com" target="_blank">bennetch@gmail.com</a>> wrote:<o:p></o:p></p><div><div><p class=MsoNormal><o:p> </o:p></p><div><div><p class=MsoNormal>On Thu, May 16, 2013 at 4:08 PM, Marc Delisle <<a href="mailto:marc@infomarc.info" target="_blank">marc@infomarc.info</a>> wrote:<o:p></o:p></p><p class=MsoNormal>Isaac Bennetch a écrit :<o:p></o:p></p><div><div><p class=MsoNormal style='margin-bottom:12.0pt'>> Hi, I just merged the pull request for AES_ENCRYPT [1], which required a<br>> little bit of manual work to complete the merge. I thought everything went<br>> well, except the commit history [2] looks strange to me. Would someone mind<br>> double-checking that I didn't inadvertently do something wrong? I pretty<br>> much followed the GitHub instructions, but this is the first time I've done<br>> a merge where I committed back to the project repository rather than my<br>> private one, so I'm a bit extra cautious.<br>><br>> Thanks<br>><br>> 1 - <a href="https://github.com/phpmyadmin/phpmyadmin/pull/290" target="_blank">https://github.com/phpmyadmin/phpmyadmin/pull/290</a><br>> 2 -<br>> <a href="https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7db329bdef9dae" target="_blank">https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7db329bdef9dae</a><o:p></o:p></p></div></div><p class=MsoNormal>Hi Isaac,<br>indeed it looks strange. I would say that you merged master into his<br>feature branch before merging back to master.<o:p></o:p></p><div><p class=MsoNormal><o:p> </o:p></p></div></div><div><p class=MsoNormal>Thanks. In the interest of not making this worse, I think the right thing to do is git revert 16febdb. That will take me back to the last commit before my mistake, "There should be message variable as well". Then I have to commit and push that revert. Then I can redo the ayusun merge correctly. I just want to make positively sure that I do the revert correctly.<o:p></o:p></p></div></div></div></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>After a bit more testing, I think the even better response is to git reset --hard 16feb and push that change. One part of the git documentation suggests one, another part suggests the other. I'm not clear on what the differences are.<br><br>The problem is that when I do a git diff and git status to make sure of what I'm about to push, it looks right...but then again, it also did when I messed things up. <o:p></o:p></p></div></div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>Any opinions?<o:p></o:p></p></div></div></div></div></body></html>