couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fli...@apache.org
Subject [couchdb-documentation] branch spelling updated (a138bf5 -> a3b8c1e)
Date Mon, 23 Oct 2017 12:50:28 GMT
This is an automated email from the ASF dual-hosted git repository.

flimzy pushed a change to branch spelling
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


    omit a138bf5  Switch to American English spelling
    omit cac31bb  Minor formatting improvements
    omit 2d93bf7  Spelling corrections
     new 0c73548  Spelling corrections
     new d868623  Minor formatting improvements
     new a3b8c1e  Switch to American English spelling

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a138bf5)
            \
             N -- N -- N   refs/heads/spelling (a3b8c1e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/replication/conflicts.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

Mime
View raw message