Sharp Stock

English

简体中文

English

简体中文

Conflict Resolution Guide ​

In a multi-user collaborative project environment, an SVN conflict occurs when two or more team members modify the same file and attempt to commit simultaneously. As a collaborative tool, Sharp Stock monitors these potential conflict states in real-time and provides safety alerts.

1. Typical Scenarios for Conflict ​

  • Concurrent Metadata Editing: Member A modifies the tags for icon.png and commits; Member B, without updating, modifies the note description for the same file. When B attempts to synchronize, a conflict is triggered due to inconsistent database records.
  • Structural Conflict (Tree Conflict): Member A moves a folder on the physical disk while Member B is editing assets within that folder.

2. How to Identify Conflict Status ​

  • Status Button Prompts: When the [Commit] or [Update] buttons at the bottom of the left navigation bar are highlighted in red, it indicates that the current asset library has detected a version conflict that must be resolved first.
  • Operation Block Feedback: When attempting to synchronize, the system will pop up a warning dialog informing you that differences between the local and server versions must be resolved before proceeding.

3. Core Conflict Category Description ​

Asset Physical File Conflict (.png, .fbx, .spine, etc.) ​

Since most art assets are in binary format, they cannot be automatically merged at the line level like code.

  • Manifestation: Temporary copies with suffixes like .mine, .rX, or .rY will appear in the local directory.
  • Handling Principle: Such conflicts must be manually judged by relevant personnel to determine which version to keep.

Core Database Conflict (assetlib.db) ​

This is the most critical conflict type, as all tags, notes, and custom IDs are stored here.

  • Reason for Generation: Multiple users performed metadata labeling on different assets without updating first.
  • Potential Risk: Incorrect handling through forced overwriting will result in the loss of valuable metadata information written by team members.

4. Standard Resolution Process ​

Sharp Stock prioritizes data security. We recommend resolving conflicts following these professional steps:

Step 1: Exit the Application Completely ​

Before starting to fix a conflict, be sure to close the Sharp Stock software. This releases the system lock on the assetlib.db file, preventing data corruption during the repair process.

Step 2: Call a Professional SVN Client ​

Open File Explorer and perform the following operations in the asset library root directory via TortoiseSVN (or related tools on macOS):

  1. Right-click the conflicted file and select Edit Conflicts.
  2. Handle Resource Files: Choose Resolve using 'mine' or Resolve using 'theirs' based on requirements.
  3. Handle Database File: We recommend checking SVN commit logs first. If automatic merging is impossible, ensure you keep the version with the most complete metadata and notify involved team members.

Step 3: Mark as Resolved ​

After completing manual fixes, select Resolved from the TortoiseSVN menu. This will remove the generated temporary files and allow you to re-initiate a commit.

5. Collaboration Prevention Suggestions ​

  • Sync-First Principle: Develop a habit of executing an [Update] before starting work each day to ensure all operations are based on the latest version.
  • Atomic Commits: We recommend a "high-frequency, small-amount" commit strategy. Do not pile up several days' worth of changes before uploading; this effectively reduces conflict probability.
  • Team Communication First: Before executing major directory structure adjustments (such as large-scale moving or renaming of folders), be sure to announce it in team communication groups to coordinate and avoid overlapping operation periods.