view release on metacpan or  search on metacpan

lib/App/karr/Git.pm  view on Meta::CPAN

    $self->_warn_foundation_conflicts( $remote, \@conflicts ) if @conflicts;
    die $self->_unapplied_refs_error( $remote, \@unapplied, \@stale )
        if @unapplied;
    return;
}

# Said, but not parked. The board keeps the losing side under
# refs/karr-conflict/ because a displaced card is something a person reads back
# and re-applies; a displaced chain step is a plan, and the answer to a plan
# that lost a race is another planning round, not an archaeology dig. What is
# worth saying is that it happened at all: two planners writing one chain is
# the condition, and the operator is the only one who can end it.
sub _warn_foundation_conflicts {
    my ( $self, $remote, $refs ) = @_;
    my $names = join ', ', map { substr $_, length FOUNDATION_ROOT } @$refs;
    warn "karr: this clone and the remote '$remote' both changed $names "
       . "under " . FOUNDATION_ROOT . " since the last sync.\n"
       . "The remote version is now in place and the local one is not kept. "
       . "Re-plan rather than re-edit.\n";
    return;