<div class="gmail_quote">On Thu, Apr 5, 2012 at 1:13 PM, William Kyngesburye <span dir="ltr"><<a href="mailto:woklist@kyngchaos.com">woklist@kyngchaos.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
No matter how much people rave about git, I still find it more difficult than svn.<br>
<br></blockquote><div><br></div><div>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.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
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.<br>
</blockquote><div><br></div><div>The following should get your local release tree back into line with upstream (main git repo) release-1_8</div><div><br></div><div>git checkout release-1_8</div><div>git fetch upstream</div>
<div>git reset --hard upstream/release-1_8</div><div>git rebase upstream/release-1_8</div><div><br></div><div>now to get your commits over from master just use cherry pick:</div><div><br></div><div>git cherry-pick bd916b1</div>
<div>git cherry-pick 2a126af</div><div><br></div><div>To keep your local up to date just do:</div><div><br></div><div>git pull --rebase upstream release-1_8</div><div><br></div><div>then</div><div><br></div><div>git push upstream release-1_8</div>
<div><br></div><div>- Nathan</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Can someone backport bd916b1 and 2a126af to release-1_8 for me while I straighten out my local copy (and get some sleep first)?<br>
<br>
-----<br>
William Kyngesburye <kyngchaos*at*kyngchaos*dot*com><br>
<a href="http://www.kyngchaos.com/" target="_blank">http://www.kyngchaos.com/</a><br>
<br>
"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....<br>
<br>
- the wisdom of Tarzan<br>
<br>
<br>
_______________________________________________<br>
Qgis-developer mailing list<br>
<a href="mailto:Qgis-developer@lists.osgeo.org">Qgis-developer@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-developer" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-developer</a><br>
</blockquote></div><br>