How to Resolve Binary File Conflicts with Git? - 面试题

Handling binary file conflicts in Git can be more challenging compared to text files because we cannot directly merge differences within binary files. Here are some steps and recommendations to resolve such conflicts:

1. Preventive Measures to Avoid Conflicts

First, the best strategy is to minimize binary file conflicts. This can be achieved by the following methods:

File Locking: In version control systems like Git Large File Storage (LFS), file locking mechanisms can be used. This ensures that when one user is editing a file, other users cannot simultaneously edit the same file.
Team Collaboration Guidelines: Team members should agree on clear rules, such as who and when can edit specific files, to reduce the likelihood of concurrent editing.
Reasonable File Organization: Distribute binary files across different directories or repositories to minimize the chance of multiple users working on the same file simultaneously.

2. Manual Conflict Resolution

When binary file conflicts occur, manual intervention is typically required:

Check Out and Compare Versions: First, use Git commands to check out the conflicting versions, for example, with git checkout:
```
bash
git checkout --ours path/to/conflicted-file
git checkout --theirs path/to/conflicted-file
```
Here, --ours and --theirs represent the versions from the current branch and the merge branch, respectively.
Use Professional Tools: For files like graphics, audio, or video, employ appropriate professional software to open and compare both versions, determine which version to retain, or whether external merge editing is necessary.
Decide Which Version to Adopt: After comparing all versions, decide which version to adopt or merge changes using external tools before committing again.

3. Commit the Solution

After resolving the conflict, mark the fixed file as resolved and commit the changes:

bash
  git add path/to/resolved-file
  git commit -m "Resolve binary file conflict"

Example

Suppose you and your colleague both edited a binary file named project.zip and encountered a conflict during merging. Download both versions, use a compression file manager to inspect the contents, confirm necessary changes, and then choose one version or manually merge changes into a new compressed file. After completion, use the above Git commands to commit the resolved file.

In practical work, it is generally recommended to use Git LFS or similar tools for frequently changing binary files to simplify management and optimize performance.