diff options
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 10 |
1 files changed, 0 insertions, 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. | |||
| 77 | If you remove a gnulib module, or if a gnulib module | 77 | If you remove a gnulib module, or if a gnulib module |
| 78 | removes a file, then remove the corresponding files by hand. | 78 | removes a file, then remove the corresponding files by hand. |
| 79 | 79 | ||
| 80 | * How to merge changes from emacs-24 to master | ||
| 81 | |||
| 82 | [The section on git merge procedure has not yet been written.] | ||
| 83 | |||
| 84 | You may see conflicts in autoload md5sums in comments. Strictly | ||
| 85 | speaking, the right thing to do is merge everything else, resolve the | ||
| 86 | conflict by choosing either the master or branch version, then run | ||
| 87 | 'make -C lisp autoloads' to update the md5sums to the correct master | ||
| 88 | value before committing. | ||
| 89 | |||
| 90 | * Re-adding a file that has been removed from the repository | 80 | * Re-adding a file that has been removed from the repository |
| 91 | 81 | ||
| 92 | Let's suppose you've done: | 82 | Let's suppose you've done: |