couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxepal <...@git.apache.org>
Subject [GitHub] couchdb pull request: New document sidebar
Date Sun, 29 Jun 2014 23:12:35 GMT
Github user kxepal commented on the pull request:

    https://github.com/apache/couchdb/pull/248#issuecomment-47482085
  
    @garrensmith There is still an merge conflict issue for master HEAD:
    
    ```
    Checking patch src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html...
    error: while searching for:
    
      </div>
      <div class="modal-footer">
        <button data-dismiss="modal" class="btn cancel-button"><i class="icon fonticon-circle-x"></i>
Cancel</button>
        <button id="duplicate-btn" class="btn btn-success save"><i class="fonticon-circle-check"></i>
Clone</button>
      </div>
    </div>
    
    
    error: patch failed: src/fauxton/app/addons/documents/templates/duplicate_doc_modal.html:28
    
    ```
    
    However, I deal with it via 3-way merge. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message