Hi, I just merged the pull request for AES_ENCRYPT [1], which required a little bit of manual work to complete the merge. I thought everything went well, except the commit history [2] looks strange to me. Would someone mind double-checking that I didn't inadvertently do something wrong? I pretty much followed the GitHub instructions, but this is the first time I've done a merge where I committed back to the project repository rather than my private one, so I'm a bit extra cautious.
Thanks
1 - https://github.com/phpmyadmin/phpmyadmin/pull/290 2 - https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7d...
Isaac Bennetch a écrit :
Hi, I just merged the pull request for AES_ENCRYPT [1], which required a little bit of manual work to complete the merge. I thought everything went well, except the commit history [2] looks strange to me. Would someone mind double-checking that I didn't inadvertently do something wrong? I pretty much followed the GitHub instructions, but this is the first time I've done a merge where I committed back to the project repository rather than my private one, so I'm a bit extra cautious.
Thanks
1 - https://github.com/phpmyadmin/phpmyadmin/pull/290 2 - https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7d...
Hi Isaac, indeed it looks strange. I would say that you merged master into his feature branch before merging back to master.
On Thu, May 16, 2013 at 4:08 PM, Marc Delisle marc@infomarc.info wrote:
Isaac Bennetch a écrit :
Hi, I just merged the pull request for AES_ENCRYPT [1], which required a little bit of manual work to complete the merge. I thought everything
went
well, except the commit history [2] looks strange to me. Would someone
mind
double-checking that I didn't inadvertently do something wrong? I pretty much followed the GitHub instructions, but this is the first time I've
done
a merge where I committed back to the project repository rather than my private one, so I'm a bit extra cautious.
Thanks
https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7d...
Hi Isaac, indeed it looks strange. I would say that you merged master into his feature branch before merging back to master.
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.
Sir, i Just updated my master branch from upstream and then updated my origin/master, just to avoid those problem of getting merge conflicts in the future and then saw this message. Do you think this updation will cause some problem in merging, i still consider myself pretty inexperienced when it comes to git, so i thought i should just ask, and revert back to the last commit if it's going to create problem.
Thanks Ayush
On May 16, 2013, at 9:29 PM, ayush choubey ayush.choubey@gmail.com wrote:
Sir, i Just updated my master branch from upstream and then updated my origin/master, just to avoid those problem of getting merge conflicts in the future and then saw this message. Do you think this updation will cause some problem in merging, i still consider myself pretty inexperienced when it comes to git, so i thought i should just ask, and revert back to the last commit if it's going to create problem.
No worries — I believe this is entirely my fault
Thanks Ayush
AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
On Thu, May 16, 2013 at 4:31 PM, Isaac Bennetch bennetch@gmail.com wrote:
On Thu, May 16, 2013 at 4:08 PM, Marc Delisle marc@infomarc.info wrote:
Isaac Bennetch a écrit :
Hi, I just merged the pull request for AES_ENCRYPT [1], which required a little bit of manual work to complete the merge. I thought everything
went
well, except the commit history [2] looks strange to me. Would someone
mind
double-checking that I didn't inadvertently do something wrong? I pretty much followed the GitHub instructions, but this is the first time I've
done
a merge where I committed back to the project repository rather than my private one, so I'm a bit extra cautious.
Thanks
https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7d...
Hi Isaac, indeed it looks strange. I would say that you merged master into his feature branch before merging back to master.
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.
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.
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.
Any opinions?
From: Isaac Bennetch [mailto:bennetch@gmail.com] Sent: Friday, May 17, 2013 5:12 AM To: phpmyadmin-devel@lists.sourceforge.net Subject: Re: [Phpmyadmin-devel] Double-checking a commit
On Thu, May 16, 2013 at 4:31 PM, Isaac Bennetch bennetch@gmail.com wrote:
On Thu, May 16, 2013 at 4:08 PM, Marc Delisle marc@infomarc.info wrote:
Isaac Bennetch a écrit :
Hi, I just merged the pull request for AES_ENCRYPT [1], which required a little bit of manual work to complete the merge. I thought everything went well, except the commit history [2] looks strange to me. Would someone
mind
double-checking that I didn't inadvertently do something wrong? I pretty much followed the GitHub instructions, but this is the first time I've
done
a merge where I committed back to the project repository rather than my private one, so I'm a bit extra cautious.
Thanks
https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7d b329bdef9dae
Hi Isaac, indeed it looks strange. I would say that you merged master into his feature branch before merging back to master.
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.
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.
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.
Any opinions?
Le 2013-05-16 23:11, Isaac Bennetch a écrit :
On Thu, May 16, 2013 at 4:31 PM, Isaac Bennetch <bennetch@gmail.com mailto:bennetch@gmail.com> wrote:
On Thu, May 16, 2013 at 4:08 PM, Marc Delisle <marc@infomarc.info <mailto:marc@infomarc.info>> wrote: Isaac Bennetch a écrit : > Hi, I just merged the pull request for AES_ENCRYPT [1], which required a > little bit of manual work to complete the merge. I thought everything went > well, except the commit history [2] looks strange to me. Would someone mind > double-checking that I didn't inadvertently do something wrong? I pretty > much followed the GitHub instructions, but this is the first time I've done > a merge where I committed back to the project repository rather than my > private one, so I'm a bit extra cautious. > > Thanks > > 1 - https://github.com/phpmyadmin/phpmyadmin/pull/290 > 2 - > https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7db329bdef9dae Hi Isaac, indeed it looks strange. I would say that you merged master into his feature branch before merging back to master. 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.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.
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.
Any opinions?
I think it's too late to do a reset and push this, because there have been other commits since (other than yours). If we lost nothing in the source code, I would not care about the history.
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.
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.
Any opinions?
Would we not lose the commits listed here, then? https://github.com/phpmyadmin/phpmyadmin/commits/master
Best, J.M.
-
ayush choubey -
Isaac Bennetch -
J.M. -
Marc Delisle