Re: Typing error in db-postgresql/postgresql-sql.lisp
Nicolas Neuss <[email protected]> Wed, 28 Apr 2010 14:42:53 +0200
| Newsgroups | gmane.lisp.clsql.general |
|---|---|
| Organization | KIT Karlsruhe |
| Message-ID | <[email protected]> |
Kevin Rosenberg <kevin-HJRc7zDS/[email protected]> writes: > On Apr 27, 2010, at 5:49 AM, Nicolas Neuss wrote: >> databse > > Thanks -- that was fixed in version 5.0.6. > > Kevin 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? Thank you, Nicolas -- PD Dr. Nicolas Neuss KIT Karlsruhe Tel: 0049-721-608-7634 Email: [email protected] WWW: <http://www.math.kit.edu/~neuss>