- CONFIGURATION AND ENVIRONMENT
- BUGS AND LIMITATIONS
- LICENSE AND COPYRIGHT
App::Git::Workflow::Command::Take - Resolve merge conflicts by only taking one side of each conflicted section
This documentation refers to git-take-mine version 0.7
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
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.
Finds the conflicted files to resolve
Resolves conflicts in
$file in favor of
There are no known bugs in this module.
Please report problems to Ivan Wills (email@example.com).
Patches are welcome.
Ivan Wills - (firstname.lastname@example.org)
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.