X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
DKIM-Signature:	v=1; a=rsa-sha256; c=simple; d=mail.ud03.udmedia.de; h=
	mime-version:in-reply-to:references:content-type:message-id
	:content-transfer-encoding:from:subject:date:to; s=beta; bh=jahM
	xmKZ92q8FBjQCES930JK+LCtSeknSkgQpjnoSwE=; b=N8FpVanbo7Lg1GUBKtAg
	PAThaACxZs82KbGjOniNfsYfvBAk3lg+Sc3ink8wUYnDbAkWIK3zI9iM6iyWhKdy
	BzH9DJr5B/M7OR9NNMuGtFteg0flwM3SQS0gZFfHhj8PWxJWVOq4SfJRE6JTwYb+
	M7+XlB/wytXngRi/+P64TWY=
Mime-Version:	1.0 (Apple Message framework v753.1)
In-Reply-To:	<20121023194935.37dd2ef5@Parasomnia.thuis.lan>
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>
Message-Id:	<14298605-8530-4818-83C8-B242AAFFEF9A@jump-ing.de>
From:	Markus Hitter <mah AT jump-ing DOT de>
Subject:	Re: [geda-user] Odd position mangling error
Date:	Wed, 24 Oct 2012 01:30:34 +0200
To:	geda-user AT delorie DOT com
X-Mailer:	Apple Mail (2.753.1)
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

Am 23.10.2012 um 19:49 schrieb Bas Gieltjes:

> Use git stash to temporarily store your local modifications, check the
> man page for these options: save, pop (and list). Use these before and
> after updating from the project repository, check with the 'list'  
> option
> what has happened.

Maybe it's a bit off topic for this thread, but for local changes I  
always recommend to open a local branch. Saves a lot of hassles when  
following a central repository.

Original:

- a - b   <- master (local & remote)
        \
         c - d   <- work (local only)

after git pull:

- a - b - e - f - g  <- master
        \
         c - d   <- work

Now you can update your work to be based on the latest git master  
with git rebase and without any hurry. 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.


Markus

- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/

- Raw text -