On Wed, Apr 4, 2012 at 10:11 PM, Nathan Woodrow <span dir="ltr"><<a href="mailto:madmanwoo@gmail.com">madmanwoo@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="gmail_quote">On Thu, Apr 5, 2012 at 1:13 PM, William Kyngesburye <span dir="ltr"><<a href="mailto:woklist@kyngchaos.com" target="_blank">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></blockquote><div><br></div><div><br></div><div>After a hard reset, the local branch _will be exactly the same_ as the remote branch. After this, a rebase is pointless as there are no commits unique to the local branch that can be replayed on top of the remote.</div>
<div><br></div><div>-Charlie</div></div>