This repository contains a merge tool, in the shape of a shell script, that can handle merging conflicting .tst files.
It also contains a feature branch with conflicting changes made to a .tst file.
In this exercise, we will configure the git repository to always resolve merge conflicts in .tst files through the merge-tst-files.sh script.
We'll do this by setting up merge-tst-files.sh as a merge driver for .tst files.
- Run
source setup.sh(or.\setup.ps1in PowerShell)
- Define the
merge-tst-files.shscript as a merge driver in.git/config - Set the merge driver to be used for
.tstfiles in.gitattributes - Add the
merge-tst-files.shscript to PATH - Merge in the
feature/1branch - Check the output to verify that the
merge-tst-files.shscript was used to resolve the conflict. - Can you commit/push your merge driver configuration? If not, how else would you distribute it?