Re: Typing error in db-postgresql/postgresql-sql.lisp

Nicolas Neuss <[email protected]> writes:
> OK, I see.  My git knowledge is still very scarce.  I had tried to do
> "git pull" before reporting, which resulted in
>
>   error: Your local changes to 'db-postgresql/postgresql-sql.lisp' would
>   be overwritten by merge.  Aborting.
>
> What is the git procedure then to actually do a merge?  Or at least to
> make a diff with the available changes?  Do I have to work with
> branches?

Hi,

So my git knowledge is not enormous either, but it seems that the
easiest thing to do is the following. First fetch updates to the repo
you're tracking:

  git fetch

or

  git fetch <repo>

(if it's not the default). The command "git pull" basically just does
this and then merges the results. Now you could do something like

  git diff origin/master

which compares the current working tree with the "master" revision of
the remote called "origin".

I'm guessing that, since there was already a fix on the lines you'd
changed, automatic merging algorithms couldn't work out what to do. A
good option in this case, if you don't want to bother with making a
branch, is to use "git stash", which saves changes to the working tree
somewhere out of the way.

I hope this is of some use. Oh, and working with branches isn't too bad
- you can create and destroy them in seconds, so it's not like you have
to worry about messing stuff up!


Rupert

_______________________________________________
CLSQL mailing list
[email protected]
http://lists.b9.com/cgi-bin/mailman/listinfo/clsql

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iJwEAQECAAYFAkvZinwACgkQRtd/pJbYVobnwQP/TiLUFBNtJfDOkS5GWRRTg4hi
fsZk8BsJieCJDzRczMXeqOH8T3u+nkzl7GIJmJIrl36sbBjsFREkWNHSVNS1BqOx
yxg9MhRNyi3H5BCSNHYxHC1S8XG+LPGO6eKpU2lPN3DR5/iH11EPo6Or6s0O1nDW
Wi5tU1uiNKnxJpDkkO0=
=ZNX9
-----END PGP SIGNATURE-----