On Sun, Nov 22, 2015 at 10:34:51PM +0000, Guenter Milde wrote:
> On 2015-11-22, Kornel Benko wrote:
> > Am 22. November 2015 um 13:00:20, schrieb Guenter Milde <mi...@users.sf.net>
> >> On 2015-11-21, Kornel Benko wrote:
> 
> >> > So my fix is obsolete?
> 
> >> I don't know how you fixed it, but I think so (this can be fixed in the
> >> document, it hat nothing to do with math fonts).
> 
> > I fixed it in document. Committed. Pushed. And then I had a 30 minutes
> > pleasure with git. Could not push, because my head was one behind,
> > merging not successful, please resolve conflicts first, and so on.
> 
> Sorry for this. I know it is annoying - had similar problems several times
> (and spent more than 30 minutes cleaning up) until I learned to pull from git
> every time before starting a LyX-coding session...

+1

In particular, 'git pull --rebase' and if there is a problem during
rebasing, it is possible someone is working on similar code.

Scott

Attachment: signature.asc
Description: PGP signature

Reply via email to