[Qgis-developer] stupid git

[Nathan Woodrow]

On Thu, Apr 5, 2012 at 1:13 PM, William Kyngesburye
<woklist at kyngchaos.com>wrote:

> No matter how much people rave about git, I still find it more difficult
> than svn.
>
>
Of course, it's a completely different beast.  Git being distributed vs the
central svn makes things a lot more powerful but a little bit harder.


> So, my local release-1_8 branch refuses to merge and I can't backport my
> install doc updates from master.  I think I successfully did a reset, but
> trying to push my commit gives a error about a non-fast-forward updates.
>

The following should get your local release tree back into line with
upstream (main git repo) release-1_8

git checkout release-1_8
git fetch upstream
git reset --hard upstream/release-1_8
git rebase upstream/release-1_8

now to get your commits over from master just use cherry pick:

git cherry-pick bd916b1
git cherry-pick 2a126af

To keep your local up to date just do:

git pull --rebase upstream release-1_8

then

git push upstream release-1_8

- Nathan


>
> Can someone backport bd916b1 and 2a126af to release-1_8 for me while I
> straighten out my local copy (and get some sleep first)?
>
> -----
> William Kyngesburye <kyngchaos*at*kyngchaos*dot*com>
> http://www.kyngchaos.com/
>
> "Mon Dieu! but they are all alike.  Cheating, murdering, lying, fighting,
> and all for things that the beasts of the jungle would not deign to possess
> - money to purchase the effeminate pleasures of weaklings.  And yet withal
> bound down by silly customs that make them slaves to their unhappy lot
> while firm in the belief that they be the lords of creation enjoying the
> only real pleasures of existence....
>
> - the wisdom of Tarzan
>
>
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20120405/5bc0deaa/attachment.html