X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
Message-ID: <20121023233036.1882.qmail@stuge.se>
Date: Wed, 24 Oct 2012 01:30:36 +0200
From: Peter Stuge <peter AT stuge DOT se>
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] Odd position mangling error
Mail-Followup-To: geda-user AT delorie DOT com
References: <5086B5AD DOT 9080706 AT estechnical DOT co DOT uk> <CAPYb0EGLoBRUWzokBzsHbacMU8RhnfFnnq+-_+JQB_9m5V9E0Q AT mail DOT gmail DOT com> <5086C5E4 DOT 7060900 AT estechnical DOT co DOT uk> <20121023194935 DOT 37dd2ef5 AT Parasomnia DOT thuis DOT lan> <14298605-8530-4818-83C8-B242AAFFEF9A AT jump-ing DOT de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <14298605-8530-4818-83C8-B242AAFFEF9A@jump-ing.de>
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

Markus Hitter wrote:
> Either in one chunk with
>
> git checkout work
> git rebase master
>
> or in small steps with
>
> git checkout work
> git rebase e
> git rebase f
> git rebase master
>
> The latter is more on the safe side, as smaller rebases have fewer reasons 
> for conflicts. You can always try the fast one first, then git rebase 
> --abort on failure and try again with the second variant.

The two are equivalent, just that the former method saves a lot of
typing. The result will be identical, and if there is any conflict
it will happen at exactly the same place, and it will have to be
resolved either way.

After resolving a conflict during rebase, run:

git add fixedfiles
git rebase --continue

..to tell git to continue. :)


//Peter