Ivan Wills
and 1 contributors

NAME

App::Git::Workflow::Command::Take - Resolve merge conflicts by only taking one side of each conflicted section

VERSION

This documentation refers to git-take-mine version 0.7

SYNOPSIS

   git-take-mine [option] [path_or_file]

 OPTIONS:
  -q --quiet    Suppress notifying of files changed
     --ours     Take choanges from current branch throwing away other branches changes
     --theirs   Take changes from merging branch throwing away current branches changes

  -v --verbose  Show more detailed option
     --VERSION  Prints the version information
     --help     Prints this help information
     --man      Prints the full documentation for git-take-mine

DESCRIPTION

git take provides a way of quickly resolving conflicts by taking only one side of the conflict. It does this differently to git checkout --ours / git checkout --theirs as it only takes the conflicted part not the whole of one side of the merge. Where this can come in handy is for merging things with version number (eg pom.xml) where only the version number conflicts and there may be other changes in the file that should be taken.

SUBROUTINES/METHODS

run ()

Finds the conflicted files to resolve

resolve ($file)

Resolves conflicts in $file in favor of --ours or --theirs.

DIAGNOSTICS

CONFIGURATION AND ENVIRONMENT

DEPENDENCIES

INCOMPATIBILITIES

BUGS AND LIMITATIONS

There are no known bugs in this module.

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

Patches are welcome.

AUTHOR

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

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