[Qgis-developer] stupid git

[Charlie Sharpsteen]

On Wed, Apr 4, 2012 at 10:11 PM, Nathan Woodrow <madmanwoo at gmail.com> wrote:

> 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
>


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.

-Charlie
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20120404/86852ab0/attachment.html