App::Git::Workflow::Command::BranchConflicts - Module to find git branches that would conflict if merged
This documentation refers to App::Git::Workflow::Command::BranchConflicts version 0.6
git-branch-conflicts [--remote|-r|--all|-a] [(--merge|-m) branch] [(--since|-s) date] [(--ignore|-i) regex] OPTIONS: -r --remote List all remote branches -a --all List all branches -m --merge[=]branch Operate only on branches not merged with this branch -s --since[=]date Only look at branches that have changes since this date -i --ignore[=]regex Ignore any files matching this regex that conflict during test merges (e.g. pom.xml changes) -q --quiet quite output --verbose Show more detailed option --version Prints the version information --help Prints this help information --man Prints the full documentation for git-branch-grep
run ()
Entry point to running conflict checking
checkout_branch ($branch)
Checks out branch in temporary branch
merge_branch_conflicts ($branch)
Tries merging branch into current branch
cleanup ()
Deletes all temporary branches
There are no known bugs in this module.
Please report problems to Ivan Wills (ivan.wills@gmail.com).
Patches are welcome.
Ivan Wills - (ivan.wills@gmail.com)
Copyright (c) 2015 Ivan Wills (14 Mullion Close, Hornsby Heights, NSW Australia 2077). All rights reserved.
This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. See perlartistic. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
To install App::Git::Workflow::Command::BranchConflicts, copy and paste the appropriate command in to your terminal.
cpanm
cpanm App::Git::Workflow::Command::BranchConflicts
CPAN shell
perl -MCPAN -e shell install App::Git::Workflow::Command::BranchConflicts
For more information on module installation, please visit the detailed CPAN module installation guide.