RE: git merge (again) (was Re: [csmith-project/csmith] 0229d0: ...)

[Eric Eide <eeide@cs.utah.edu>]

	Xuejun> Eric, I know you are going raise the eyebrow. I did try
	Xuejun> "rebase", and git wouldn't allow me. Here is the error message:

I'll mention, by the way, that git lets you continue working while you sort
these things out.  What I mean to say is, you shouldn't feel that you have to
"git push" just in order to keep working.

For example, my build-a-shared-library branch is sitting in my tree, waiting
for the right time to push it up.  I did the PATH->HOME renaming changes while
the shared-library work was committed in my local repo.

Of course you have to push your changes up before others can see them :-).
Once you push, it can be difficult to revise the shared history, but before you
push you can rewrite your local history pretty much any way to you want.  So if
you're not happy with the history you're getting, just don't push.

Another useful tool for suspending work is "git stash".  I'll let you read up
on this.  It is not really the right thing for this case, because you were
describing a situation in which you simply wanted to discard a bunch of
changes, not save them for later.

We will get the hang of this soon :-).

Eric.

-- 
-------------------------------------------------------------------------------
Eric Eide <eeide@cs.utah.edu>  .         University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX