The London Perl and Raku Workshop takes place on 26th Oct 2024. If your company depends on Perl, please consider sponsoring and/or attending.
 / 
App-Git-CheckMergeConflicts-0.02
/ App::Git::CheckMergeConflicts

NAME

App::Git::CheckMergeConflicts - Display possible merge conflicts between branches in a git repository

DESCRIPTION

The executable script in this package performs a git-merge --no-commit and collects the error output caused by merge conflicts. If an error does occur, it checks to see which files failed to merge and stores the diff output for display. After each merge attempt it executes git-merge --abort to clean up the working directory.