[Qgis-developer] Git help needed

[Werner Macho]

assuming that you have commited something to your origin (your fork on
github)
you should first clean your local repo with upstream - to be in sync with
upstream

git reset --hard upstream/master

and then force your local to your origin..

git push origin +master

the bad thing is that you will loose all local changes .. but you did only
ask for cleaning not for saving your data ;)

and i found this solution also on stackexchange
http://stackoverflow.com/questions/8134960/git-how-to-revert-master-branch-to-upstream

kind regards
Werner


On Thu, May 2, 2013 at 10:34 AM, MORREALE Jean Roc
<jr.morreale at enoreth.net>wrote:

> Hi,
>
> Could a git expert tell me how to clean my repo ?
>
> The situation : my fork origin/master is synced with upstream/master but
> if I do a pull request, some old commits are taken into account even if
> they aren't relevant.
>
> The desired solution : wipe all my local history and get a "pure" copy of
> upstream as if I just forked, without deleting my actual github fork.
>
> Regards,
>
> Jean-Roc
> ______________________________**_________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> http://lists.osgeo.org/**mailman/listinfo/qgis-**developer<http://lists.osgeo.org/mailman/listinfo/qgis-developer>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-developer/attachments/20130502/00d28a30/attachment.html>