Re: [limesurvey-developers] git commit amend in 2.06 branch

[Alfredo E. <aed...@gm...>]

The problem is the typo was in the comment of the commit, not in the code.
You can see the same typo in master branch: "ussue" instead of "issue".

Alfredo
El 12/01/2015 18:20, "Denis Chenu" <de...@sh...> escribió:

>  Why not just a "Fix typo" commit ;), then no issue with pull/push :)
>
> Example :
> https://github.com/LimeSurvey/LimeSurvey/commit/d4d1c143854b48ad4928b6363608475b35b29bdd
>
> Denis
>
> Le 12/01/2015 16:09, Alfredo Esteban a écrit :
>
> Hi,
>
>  This morning I committed to master and  2.06 branch with a typo (ussue)
> in the comment. I have committed with --amend option and push --force to
> 2.06 branch to fix the typo.
>
>  If you have not pulled this morning from 2.06 you can ignore this email.
> If you have pulled after my commit with the typo (11:45 aprox) and before I
> fixed the comment (a few minutes ago) you have to:
>
>  git fetch origin
> git reset --hard origin/master # Loses local commits
>
>  See this link
> <http://stackoverflow.com/questions/8981194/changing-git-commit-message-after-push-given-that-no-one-pulled-from-remote>for
> more info.
>
>  I think I will keep the typo in master to prevent these problems in main
> branch (do you agree?)
>
>  Sorry for the inconveniences,
>
>  Alfredo
>
>
> ------------------------------------------------------------------------------
> New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
> GigeNET is offering a free month of service with a new server in Ashburn.
> Choose from 2 high performing configs, both with 100TB of bandwidth.
> Higher redundancy.Lower latency.Increased capacity.Completely compliant.
> vanity: www.gigenet.com
>
>
>
> _______________________________________________
> limesurvey-developers mailing lis...@li...https://lists.sourceforge.net/lists/listinfo/limesurvey-developers
>
>
>
>
> ------------------------------------------------------------------------------
> New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
> GigeNET is offering a free month of service with a new server in Ashburn.
> Choose from 2 high performing configs, both with 100TB of bandwidth.
> Higher redundancy.Lower latency.Increased capacity.Completely compliant.
> www.gigenet.com
> _______________________________________________
> limesurvey-developers mailing list
> lim...@li...
> https://lists.sourceforge.net/lists/listinfo/limesurvey-developers
>
>