From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernt Hansen <bernt@norang.ca>
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 17:39:25 -0400
Message-ID: <8739hqccfm.fsf@norang.ca>
References: <alpine.BSF.2.00.1107280550530.88255@freire1.furyyjbeyq.arg>
	<87ipqm33i8.fsf@norang.ca>
	<alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:53560)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernt@norang.ca>) id 1QmYIj-0002Di-8u
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:39:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernt@norang.ca>) id 1QmYIi-0004LO-2I
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:39:29 -0400
Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:58910
	helo=mho-01-ewr.mailhop.org) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernt@norang.ca>) id 1QmYIh-0004LI-VO
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:39:28 -0400
In-Reply-To: <alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg>
	(Jude DaShiell's message of "Thu, 28 Jul 2011 17:34:43 -0400 (EDT)")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Jude DaShiell <jdashiel@shellworld.net>
Cc: emacs-orgmode@gnu.org

> On Thu, 28 Jul 2011, Bernt Hansen wrote:
>
>> In what situations does org-mode update fail?  I've never had to reclone
>> the org-mode repository - ever.  If git update fails, just do it again.
>> Recloning means you need to download all of the objects for org-mode
>> again which should never be necessary.
>> 
>> If you've messed up your local master branch somehow and want to revert
>> back to the official 'master' branch then just
>> 
>> $ git checkout master
>> $ git reset --hard origin/master
>> 
>> which throws away any local commits and uncommitted changes in your
>> working directory.
>> 
>> I fail to understand why you would ever need this script.  Can you
>> please elaborate?
>> 

Jude DaShiell <jdashiel@shellworld.net> writes:

> Whenever I apply a patch to the Makefile an orgmode update fails since 
> my local changes have to be stashed or commited according to git.  It's 
> the merge step that fails.
>
> I probably know less about git than I ought to, but that's what's 
> happened over here.

Okay - there's an article on Worg about keeping local changes on top of
org-mode development (basically you commit your Makefile changes and
always rebase on top of origin/master -- which happens automatically
when you merge with git pull)

If that happens and you get a conflict you don't know how to deal with
and you're willing to reedit your Makefile changes (which you would have
to do anyway if you get a fresh clone) then you can just nuke everything
with

$ git checkout master
$ git reset --hard origin/master

and then redo your Makefile changes instead of recloning.

Let me know if I can provide any information to make this less painful
for you.

Regards,
Bernt