view release on metacpan or  search on metacpan

lib/App/Git/Workflow/Command/BranchConflicts.pm  view on Meta::CPAN

__DATA__

=head1 NAME

App::Git::Workflow::Command::BranchConflicts - Module to find git branches that would conflict if merged

=head1 VERSION

This documentation refers to App::Git::Workflow::Command::BranchConflicts version 0.6

=head1 SYNOPSIS

   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

=head1 DESCRIPTION


=head1 SUBROUTINES/METHODS

=head2 C<run ()>

Entry point to running conflict checking

=head2 C<checkout_branch ($branch)>

Checks out branch in temporary branch

=head2 C<merge_branch_conflicts ($branch)>

Tries merging branch into current branch

=head2 C<cleanup ()>

Deletes all temporary branches

=head1 DIAGNOSTICS

=head1 CONFIGURATION AND ENVIRONMENT

=head1 DEPENDENCIES

=head1 INCOMPATIBILITIES

=head1 BUGS AND LIMITATIONS

There are no known bugs in this module.

Please report problems to Ivan Wills (ivan.wills@gmail.com).

Patches are welcome.

=head1 AUTHOR

Ivan Wills - (ivan.wills@gmail.com)

=head1 LICENSE AND COPYRIGHT

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 L<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.

=cut