From 2d7d8735ef7d88948567dda871a8ab5baf22b53c Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 24 Nov 2024 11:27:19 +0100 Subject: [PATCH] Delete obsolete section in admin/notes/repo * admin/notes/repo: Delete section "How to merge changes from emacs-24 to master", which is documented in admin/notes/git-workflow. Also delete out-of-date autoload advice. (cherry picked from commit fc17e8727d48c32f2610c6fe7c17147bff7be52b) --- admin/notes/repo | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/admin/notes/repo b/admin/notes/repo index b4535bcb556..c5caec11e35 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -77,16 +77,6 @@ variable in admin/merge-gnulib before running it. If you remove a gnulib module, or if a gnulib module removes a file, then remove the corresponding files by hand. -* How to merge changes from emacs-24 to master - -[The section on git merge procedure has not yet been written.] - -You may see conflicts in autoload md5sums in comments. Strictly -speaking, the right thing to do is merge everything else, resolve the -conflict by choosing either the master or branch version, then run -'make -C lisp autoloads' to update the md5sums to the correct master -value before committing. - * Re-adding a file that has been removed from the repository Let's suppose you've done: -- 2.39.5