previous | next
 
home  |  search  |  contact  
  
 
 Introduction 
 BitKeeper Concepts  
 Getting Started  
 Advanced Operations 
      - Resolving Conflicts  
        . When is a Resolve is Needed?  
        . Resolve 
        . Merging Content Conflicts  
      - Specifying Older Revisions 
        . File level 
        . ChangeSet level 
        . Tag level 
      - Tags  
        . Creating a Tag 
        . Updating a Tag 
        . Revert to a tree as of Tag 
      - Branching  
        . When to Create a Clone 
        . How to Enforce Work Flow 
        . Branching and Merging 
      - Revision Ranges 
        . Specifying by Revisions 
        . Specifying by Dates 
        . Revision and Date 
      - Remote repositories 
        . bkd 
        . Sending Changes via Email 
        . Receiving Changes via Email 
 Advanced Topics 
 Reporting and Data Mining  
 Appendix A: Installation 
 Appendix B: Administration 
 Site Map 
     
When is a Resolve is Needed?
Upon a pull if there are conflicts that must be auto-merged, the pull will not succeed. The incoming data will be saved in a directory called RESYNC.

Conflicts can occur because:

  • file content changes overlap
  • permissions changes overlap
  • file name changes overlap
  • file flags changes overlap
  • tag changes overlap

When possible, these changes are auto-merged. If BitKeeper could not merge all conflicts, you will have to do a manual resolution.

Home    Company    Products    How to Buy    Downloads    Contact Us    Documentation    Support    Site Map

© 1997-2005, BitMover, Inc.