[M3commit] [modula3/cm3] 4537cb: remove unused locals

[Jay K]

$ git pull --rebaseerror: Cannot pull with rebase: You have unstaged changes.
Ugh.
 - Jay


Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals
From: hosking at purdue.edu
Date: Tue, 1 Sep 2015 21:56:30 +1000
CC: jay.krell at cornell.edu; m3commit at elegosoft.com
To: wagner at elego.de

I think I’ve managed to rebase things.
Reminder: when pulling please use "git pull —rebase" to maintain a linear history.
Tony
On 1 Sep 2015, at 9:35 pm, Olaf Wagner <wagner at elego.de> wrote:On Tue, 1 Sep 2015 21:11:42 +1000Antony Hosking <hosking at purdue.edu> wrote:Yep, Jay, the document Olaf refers to describes the problem.
I’m not sure what the remedy is but will explore.
One standard problem ist that there are both local changesand upstream changes.Then it is problematic to just call 'git merge' or 'git pull'.What should be done instead is to commit the local changesand then use 'git pull --rebase'.At least this was what solved it for me most of the time.OlafOn 1 Sep 2015, at 6:44 pm, Olaf Wagner <wagner at elego.de> wrote:

On Tue, 1 Sep 2015 07:15:32 +0000
Jay K <jay.krell at cornell.edu> wrote:

Just git push, git pull, git commit.
- Jay



Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals
From: hosking at purdue.edu
Date: Tue, 1 Sep 2015 16:58:47 +1000
CC: m3commit at elegosoft.com
To: jay.krell at cornell.edu

Jay, it appears that your commits are still messing up the history.
As of your most recent commit we have lost history again.  What exactly are you doing when you use git against the repo?

Usually history is never really _lost_ in git, just hidden ;-)
A possible explanation is that the first and second parent get
switched due to merges. This link gives a good explanation of
what is often the reason:

http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git

You should bear in mind that git is really more like a tree
management software than a traditional version control system.
You can do almost anything with it, especially shoot your own foot.

Olaf
-- 
Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com 
             Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23 45 86 96  mobile: +49 177 2345 869  fax: +49 30 23 45 86 95
Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

-- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com               Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germanyphone: +49 30 23 45 86 96  mobile: +49 177 2345 869  fax: +49 30 23 45 86 95Geschäftsführer: Olaf Wagner | Sitz: BerlinHandelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3commit/attachments/20150901/216e6ddb/attachment-0002.html>