GNU bug report logs - #70503
[PATCH] Add function "TeX-master-output-file"

Previous Next

Full log

View this message in rfc822 format

From: Arash Esbati <arash <at> gnu.org>
To: Ikumi Keita <ikumi <at> ikumi.que.jp>
Cc: Paul Nelson <ultrono <at> gmail.com>, 70503 <at> debbugs.gnu.org, Tassilo Horn <tsdh <at> gnu.org>
Subject: bug#70503: [PATCH] Add function "TeX-master-output-file"
Date: Tue, 14 May 2024 14:53:17 +0200

Ikumi Keita <ikumi <at> ikumi.que.jp> writes:

> Now bug#70811 is resolved. I think we can go now.

Thanks, I updated NEWS.org and pushed.  Then I did:

• $ git switch main
• $ git merge origin/master and get the following:

CONFLICT (modify/delete): Makefile.in deleted in HEAD and modified in
origin/master.  Version origin/master of Makefile.in left in tree.
Automatic merge failed; fix conflicts and then commit the result.

@Tassilo: Please help ;-)

Best, Arash

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.