procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/notes/bzr: Fix typos in previous.

Browse source
This commit is contained in:
Glenn Morris 2011-01-17 18:57:04 -08:00
parent 565cb73650
commit b69258a1a8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/notes/bzr
View file

@ -85,7 +85,7 @@ and to take either the trunk, branch, or both copies.
6) After resolving all conflicts, you might need to run the bzmerge
command again if there are more revisions still to merge.
Do not commit (or exit Emacs) until you have run bzrmerge to compeltion.
Do not commit (or exit Emacs) until you have run bzrmerge to completion.
Before committing, check bzr status and bzr diff output.
If you have run bzrmerge enough times, the "pending merge tip" in bzr
@ -111,6 +111,6 @@ delete the .OTHER etc files by hand and use bzr resolve path/to/file.
3) Conflicts in autoload md5sums in comments. Strictly speaking, the
right thing to do is merge everything else, resolve the conflict by
choosig either the trunk or branch version, then run `make -C lisp
choosing either the trunk or branch version, then run `make -C lisp
autoloads' to update the md5sums to the correct trunk value before
committing.