From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jean Louis Newsgroups: gmane.emacs.devel Subject: Re: Integration of dictionary package Date: Thu, 19 Nov 2020 23:39:58 +0300 Message-ID: References: <87o8k7zxoj.fsf@gmail.com> <494a350b-e2ac-5497-3336-61358517a102@hilbrich.tk> <4c83392f-9874-0047-0901-a02b6a84c2e8@hilbrich.tk> <83d009143y.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21682"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mutt/2.0 (3d08634) (2020-11-07) Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Nov 19 21:44:56 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kfqnY-0005Pq-HQ for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 21:44:56 +0100 Original-Received: from localhost ([::1]:57662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfqnV-0001cE-4B for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 15:44:53 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfqjP-0006mT-7v for emacs-devel@gnu.org; Thu, 19 Nov 2020 15:40:40 -0500 Original-Received: from static.rcdrun.com ([95.85.24.50]:51173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfqj9-0002Tt-2u; Thu, 19 Nov 2020 15:40:36 -0500 Original-Received: from localhost ([::ffff:41.202.241.56]) (AUTH: PLAIN admin, TLS: TLS1.2,256bits,ECDHE_RSA_AES_256_GCM_SHA384) by static.rcdrun.com with ESMTPSA id 00000000002C0006.000000005FB6D832.00002B86; Thu, 19 Nov 2020 20:40:17 +0000 Content-Disposition: inline In-Reply-To: <83d009143y.fsf@gnu.org> Received-SPF: pass client-ip=95.85.24.50; envelope-from=bugs@gnu.support; helo=static.rcdrun.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259455 Archived-At: * Eli Zaretskii [2020-11-19 23:31]: > > Date: Thu, 19 Nov 2020 22:27:19 +0300 > > From: Jean Louis > > Cc: orontee@gmail.com, emacs-devel@gnu.org > > > > ~/Programming/Software/emacs $ git pull origin feature/integration-of-dictionary-el > > >From git://git.sv.gnu.org/emacs > > * branch feature/integration-of-dictionary-el -> FETCH_HEAD > > Auto-merging test/src/xdisp-tests.el > > This is wrong: you do NOT want to pull from that branch into your > master branch! You need to switch to the > feature/integration-of-dictionary-el branch first. I did: git reset -hard master git checkout -b feature/integration-of-dictionary-el git pull origin feature/integration-of-dictionary-el So that is where I got stuck. >From git://git.sv.gnu.org/emacs * branch feature/integration-of-dictionary-el -> FETCH_HEAD Performing inexact rename detection: 100% (29652/29652), done. Auto-merging test/src/xdisp-tests.el CONFLICT (add/add): Merge conflict in test/src/xdisp-tests.el Auto-merging test/src/syntax-tests.el CONFLICT (content): Merge conflict in test/src/syntax-tests.el Auto-merging test/src/print-tests.el CONFLICT (content): Merge conflict in test/src/print-tests.el Auto-merging test/src/fns-tests.el CONFLICT (content): Merge conflict in test/src/fns-tests.el Auto-merging test/src/emacs-module-tests.el CONFLICT (content): Merge conflict in test/src/emacs-module-tests.el Auto-merging test/src/emacs-module-resources/mod-test.c CONFLICT (content): Merge conflict in test/src/emacs-module-resources/mod-test.c CONFLICT (modify/delete): test/src/doc-tests.el deleted in HEAD and modified in 7ca331a4f94a6a5f9c454823fd5c765031ce7167. Version 7ca331a4f94a6a5f9c454823fd5c765031ce7167 of test/src/doc-tests.el left in tree. Auto-merging test/lisp/wid-edit-tests.el CONFLICT (content): Merge conflict in test/lisp/wid-edit-tests.el Auto-merging test/lisp/vc/diff-mode-tests.el CONFLICT (content): Merge conflict in test/lisp/vc/diff-mode-tests.el Auto-merging test/lisp/textmodes/css-mode-tests.el CONFLICT (content): Merge conflict in test/lisp/textmodes/css-mode-tests.el Auto-merging test/lisp/textmodes/bibtex-tests.el CONFLICT (add/add): Merge conflict in test/lisp/textmodes/bibtex-tests.el Auto-merging test/lisp/saveplace-tests.el CONFLICT (add/add): Merge conflict in test/lisp/saveplace-tests.el Auto-merging test/lisp/progmodes/ruby-mode-tests.el CONFLICT (content): Merge conflict in test/lisp/progmodes/ruby-mode-tests.el Auto-merging test/lisp/progmodes/cperl-mode-tests.el CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-tests.el Auto-merging test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl CONFLICT (add/add): Merge conflict in test/lisp/progmodes/cperl-mode-resources/cperl-indent-styles.pl Auto-merging test/lisp/progmodes/compile-tests.el CONFLICT (content): Merge conflict in test/lisp/progmodes/compile-tests.el Auto-merging test/lisp/pcmpl-linux-tests.el CONFLICT (add/add): Merge conflict in test/lisp/pcmpl-linux-tests.el Auto-merging test/lisp/net/tramp-tests.el CONFLICT (content): Merge conflict in test/lisp/net/tramp-tests.el Auto-merging test/lisp/net/dbus-tests.el CONFLICT (content): Merge conflict in test/lisp/net/dbus-tests.el Auto-merging test/lisp/help-fns-tests.el CONFLICT (content): Merge conflict in test/lisp/help-fns-tests.el Auto-merging test/lisp/gnus/mml-sec-tests.el CONFLICT (add/add): Merge conflict in test/lisp/gnus/mml-sec-tests.el Auto-merging test/lisp/gnus/gnus-util-tests.el CONFLICT (add/add): Merge conflict in test/lisp/gnus/gnus-util-tests.el Auto-merging test/lisp/ffap-tests.el CONFLICT (content): Merge conflict in test/lisp/ffap-tests.el Auto-merging test/lisp/emacs-lisp/unsafep-tests.el CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/unsafep-tests.el Auto-merging test/lisp/emacs-lisp/rx-tests.el CONFLICT (content): Merge conflict in test/lisp/emacs-lisp/rx-tests.el Auto-merging test/lisp/emacs-lisp/find-func-tests.el CONFLICT (add/add): Merge conflict in test/lisp/emacs-lisp/find-func-tests.el Auto-merging test/lisp/emacs-lisp/bindat-tests.el Auto-merging test/lisp/custom-tests.el CONFLICT (content): Merge conflict in test/lisp/custom-tests.el Auto-merging test/lisp/calendar/time-date-tests.el CONFLICT (content): Merge conflict in test/lisp/calendar/time-date-tests.el Auto-merging test/lisp/calendar/icalendar-tests.el CONFLICT (content): Merge conflict in test/lisp/calendar/icalendar-tests.el Auto-merging test/lisp/calc/calc-tests.el CONFLICT (content): Merge conflict in test/lisp/calc/calc-tests.el Auto-merging test/lisp/bookmark-tests.el CONFLICT (content): Merge conflict in test/lisp/bookmark-tests.el Auto-merging test/lisp/autorevert-tests.el CONFLICT (content): Merge conflict in test/lisp/autorevert-tests.el Auto-merging src/xwidget.c CONFLICT (content): Merge conflict in src/xwidget.c Auto-merging src/xdisp.c CONFLICT (content): Merge conflict in src/xdisp.c Auto-merging src/nsxwidget.m CONFLICT (add/add): Merge conflict in src/nsxwidget.m Auto-merging src/nsxwidget.h CONFLICT (add/add): Merge conflict in src/nsxwidget.h Auto-merging src/nsterm.m CONFLICT (content): Merge conflict in src/nsterm.m Auto-merging src/nsfont.m CONFLICT (content): Merge conflict in src/nsfont.m Auto-merging src/module-env-28.h CONFLICT (add/add): Merge conflict in src/module-env-28.h Auto-merging src/keymap.c CONFLICT (content): Merge conflict in src/keymap.c Auto-merging src/image.c CONFLICT (content): Merge conflict in src/image.c Auto-merging src/font.c CONFLICT (content): Merge conflict in src/font.c Auto-merging src/fns.c CONFLICT (content): Merge conflict in src/fns.c Auto-merging src/emacs-module.c CONFLICT (content): Merge conflict in src/emacs-module.c Auto-merging src/dbusbind.c CONFLICT (content): Merge conflict in src/dbusbind.c Auto-merging src/character.h CONFLICT (content): Merge conflict in src/character.h Auto-merging src/alloc.c CONFLICT (content): Merge conflict in src/alloc.c Auto-merging lisp/wdired.el CONFLICT (content): Merge conflict in lisp/wdired.el Auto-merging lisp/vc/vc.el CONFLICT (content): Merge conflict in lisp/vc/vc.el Auto-merging lisp/vc/diff-mode.el CONFLICT (content): Merge conflict in lisp/vc/diff-mode.el Auto-merging lisp/tmm.el CONFLICT (content): Merge conflict in lisp/tmm.el Auto-merging lisp/time.el CONFLICT (content): Merge conflict in lisp/time.el Auto-merging lisp/textmodes/table.el CONFLICT (content): Merge conflict in lisp/textmodes/table.el Auto-merging lisp/textmodes/flyspell.el CONFLICT (content): Merge conflict in lisp/textmodes/flyspell.el Auto-merging lisp/textmodes/css-mode.el CONFLICT (content): Merge conflict in lisp/textmodes/css-mode.el Auto-merging lisp/subr.el CONFLICT (content): Merge conflict in lisp/subr.el Auto-merging lisp/skeleton.el CONFLICT (content): Merge conflict in lisp/skeleton.el Auto-merging lisp/simple.el CONFLICT (content): Merge conflict in lisp/simple.el Auto-merging lisp/savehist.el CONFLICT (content): Merge conflict in lisp/savehist.el Auto-merging lisp/progmodes/xref.el CONFLICT (content): Merge conflict in lisp/progmodes/xref.el Auto-merging lisp/progmodes/python.el CONFLICT (content): Merge conflict in lisp/progmodes/python.el Auto-merging lisp/progmodes/project.el CONFLICT (content): Merge conflict in lisp/progmodes/project.el Auto-merging lisp/progmodes/grep.el CONFLICT (content): Merge conflict in lisp/progmodes/grep.el Auto-merging lisp/progmodes/gdb-mi.el CONFLICT (content): Merge conflict in lisp/progmodes/gdb-mi.el Auto-merging lisp/progmodes/elisp-mode.el CONFLICT (content): Merge conflict in lisp/progmodes/elisp-mode.el Auto-merging lisp/progmodes/cperl-mode.el CONFLICT (content): Merge conflict in lisp/progmodes/cperl-mode.el Auto-merging lisp/progmodes/compile.el CONFLICT (content): Merge conflict in lisp/progmodes/compile.el Auto-merging lisp/progmodes/cl-font-lock.el CONFLICT (add/add): Merge conflict in lisp/progmodes/cl-font-lock.el Auto-merging lisp/progmodes/cc-mode.el CONFLICT (content): Merge conflict in lisp/progmodes/cc-mode.el Auto-merging lisp/progmodes/cc-langs.el CONFLICT (content): Merge conflict in lisp/progmodes/cc-langs.el Auto-merging lisp/progmodes/cc-defs.el CONFLICT (content): Merge conflict in lisp/progmodes/cc-defs.el Auto-merging lisp/play/bubbles.el CONFLICT (content): Merge conflict in lisp/play/bubbles.el Auto-merging lisp/outline.el CONFLICT (content): Merge conflict in lisp/outline.el Auto-merging lisp/net/tramp.el CONFLICT (content): Merge conflict in lisp/net/tramp.el Auto-merging lisp/net/tramp-smb.el CONFLICT (content): Merge conflict in lisp/net/tramp-smb.el Auto-merging lisp/net/tramp-sh.el CONFLICT (content): Merge conflict in lisp/net/tramp-sh.el Auto-merging lisp/net/tramp-gvfs.el CONFLICT (content): Merge conflict in lisp/net/tramp-gvfs.el Auto-merging lisp/net/tramp-crypt.el CONFLICT (add/add): Merge conflict in lisp/net/tramp-crypt.el Auto-merging lisp/net/tramp-compat.el CONFLICT (content): Merge conflict in lisp/net/tramp-compat.el Auto-merging lisp/net/ntlm.el CONFLICT (content): Merge conflict in lisp/net/ntlm.el Auto-merging lisp/net/mailcap.el CONFLICT (content): Merge conflict in lisp/net/mailcap.el Auto-merging lisp/net/eww.el Auto-merging lisp/net/dbus.el CONFLICT (content): Merge conflict in lisp/net/dbus.el Auto-merging lisp/net/browse-url.el Auto-merging lisp/net/ange-ftp.el CONFLICT (content): Merge conflict in lisp/net/ange-ftp.el Auto-merging lisp/mwheel.el CONFLICT (content): Merge conflict in lisp/mwheel.el Auto-merging lisp/mail/mail-extr.el CONFLICT (content): Merge conflict in lisp/mail/mail-extr.el Auto-merging lisp/mail/emacsbug.el CONFLICT (content): Merge conflict in lisp/mail/emacsbug.el Auto-merging lisp/ldefs-boot.el CONFLICT (content): Merge conflict in lisp/ldefs-boot.el Auto-merging lisp/language/misc-lang.el CONFLICT (content): Merge conflict in lisp/language/misc-lang.el Auto-merging lisp/isearch.el CONFLICT (content): Merge conflict in lisp/isearch.el Auto-merging lisp/international/mule.el CONFLICT (content): Merge conflict in lisp/international/mule.el Auto-merging lisp/ielm.el CONFLICT (content): Merge conflict in lisp/ielm.el Auto-merging lisp/gnus/nnselect.el CONFLICT (add/add): Merge conflict in lisp/gnus/nnselect.el Auto-merging lisp/gnus/message.el CONFLICT (content): Merge conflict in lisp/gnus/message.el Auto-merging lisp/gnus/gnus-util.el CONFLICT (content): Merge conflict in lisp/gnus/gnus-util.el Auto-merging lisp/gnus/gnus-group.el CONFLICT (content): Merge conflict in lisp/gnus/gnus-group.el Auto-merging lisp/gnus/gnus-fun.el CONFLICT (content): Merge conflict in lisp/gnus/gnus-fun.el Auto-merging lisp/gnus/gnus-async.el CONFLICT (content): Merge conflict in lisp/gnus/gnus-async.el Auto-merging lisp/gnus/gnus-art.el CONFLICT (content): Merge conflict in lisp/gnus/gnus-art.el Auto-merging lisp/gnus/gnus-agent.el Auto-merging lisp/ffap.el CONFLICT (content): Merge conflict in lisp/ffap.el Auto-merging lisp/eshell/em-pred.el Auto-merging lisp/eshell/em-hist.el CONFLICT (content): Merge conflict in lisp/eshell/em-hist.el Auto-merging lisp/erc/erc.el CONFLICT (content): Merge conflict in lisp/erc/erc.el Auto-merging lisp/erc/erc-log.el CONFLICT (content): Merge conflict in lisp/erc/erc-log.el Auto-merging lisp/epa.el CONFLICT (content): Merge conflict in lisp/epa.el Auto-merging lisp/emacs-lisp/warnings.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/warnings.el Auto-merging lisp/emacs-lisp/timer-list.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/timer-list.el Auto-merging lisp/emacs-lisp/package.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/package.el Auto-merging lisp/emacs-lisp/lisp.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/lisp.el Auto-merging lisp/emacs-lisp/eldoc.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/eldoc.el Auto-merging lisp/emacs-lisp/edebug.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/edebug.el Auto-merging lisp/emacs-lisp/easy-mmode.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/easy-mmode.el Auto-merging lisp/emacs-lisp/byte-opt.el CONFLICT (content): Merge conflict in lisp/emacs-lisp/byte-opt.el Auto-merging lisp/doc-view.el CONFLICT (content): Merge conflict in lisp/doc-view.el Auto-merging lisp/display-fill-column-indicator.el CONFLICT (content): Merge conflict in lisp/display-fill-column-indicator.el Auto-merging lisp/disp-table.el CONFLICT (content): Merge conflict in lisp/disp-table.el Auto-merging lisp/custom.el CONFLICT (content): Merge conflict in lisp/custom.el Auto-merging lisp/cus-edit.el CONFLICT (content): Merge conflict in lisp/cus-edit.el Auto-merging lisp/cedet/semantic/tag.el CONFLICT (content): Merge conflict in lisp/cedet/semantic/tag.el Auto-merging lisp/calc/calcalg3.el CONFLICT (content): Merge conflict in lisp/calc/calcalg3.el Auto-merging lisp/bookmark.el CONFLICT (content): Merge conflict in lisp/bookmark.el Auto-merging lisp/arc-mode.el CONFLICT (content): Merge conflict in lisp/arc-mode.el Auto-merging etc/themes/modus-vivendi-theme.el CONFLICT (add/add): Merge conflict in etc/themes/modus-vivendi-theme.el Auto-merging etc/themes/modus-operandi-theme.el CONFLICT (add/add): Merge conflict in etc/themes/modus-operandi-theme.el Auto-merging etc/PROBLEMS CONFLICT (content): Merge conflict in etc/PROBLEMS Auto-merging etc/NEWS.27 CONFLICT (add/add): Merge conflict in etc/NEWS.27 Auto-merging etc/NEWS CONFLICT (content): Merge conflict in etc/NEWS Auto-merging doc/misc/tramp.texi CONFLICT (content): Merge conflict in doc/misc/tramp.texi Auto-merging doc/misc/gnus.texi CONFLICT (content): Merge conflict in doc/misc/gnus.texi Auto-merging doc/lispref/internals.texi CONFLICT (content): Merge conflict in doc/lispref/internals.texi Auto-merging doc/emacs/package.texi CONFLICT (content): Merge conflict in doc/emacs/package.texi Auto-merging doc/emacs/frames.texi CONFLICT (content): Merge conflict in doc/emacs/frames.texi Auto-merging configure.ac CONFLICT (content): Merge conflict in configure.ac Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result. ~/Programming/Software/emacs $