Task: Resolving a Git Merge Conflict with Binary Files
Task: Resolving a Git Merge Conflict with Binary Files: a task in Terminal-Lego-15k (Harbor dataset). You have two Git repositories that simulate a common scenario: a local repository and a remote repository ( brian ). Both repositories have diverged on a binary file ( design.indd ), causing a…
The task
You have two Git repositories that simulate a common scenario: a local repository and a remote repository (`brian`). Both repositories have diverged on a binary file (`design.indd`), causing a merge conflict. Your task is to resolve the conflict by accepting the remote (`brian`) version of the binary file and…
Part of PrimeIntellect/Terminal-Lego-15k.