view release on metacpan or  search on metacpan

bin/gitc-pass  view on Meta::CPAN

# reinstate any changes present when we started
git "stash apply $stash" if $stash;

############################### helper subroutines #######################
# tells the user to resolve any merge conflicts, suspends this process
# and waits to be resumed.  Once resumed, verify that the conflict
# was resolved and committed.  If not, let the user try again or
# die.
#
# This code is very similar to code in gitc-promote.  Unfortunately, there
# were enough differences that a common framework couldn't be factored out
# cleanly.
sub let_user_resolve_conflict {
    my ($changeset, $again) = @_;
    if ( not $again ) {
        warn "There were conflicts merging '$changeset' to master.\n";

        # let the reviewer resolve the conflicts
        warn  "This process will suspend so that you can manually resolve\n"
            . "the conflict and commit.  Once you've done that, 'fg' this\n"
            . "process and the merge will continue.\n"