[英]How do I select a merge strategy for a git rebase?
git-rebase
man page mentions -X<option>
can be passed to git-merge
. git-rebase
手册页提到-X<option>
可以传递给git-merge
。 When/how exactly? 何时/究竟如何?
I'd like to rebase by applying patches with recursive strategy and theirs option (apply whatever sticks, rather than skipping entire conflicting commits). 我想通过应用修补程序与递归策略和他们的选项(适用任何棒,而不是跳过整个冲突的承诺)衍合。 I don't want merge, I want to make history linear.
我不想合并,我想使历史线性化。
I've tried: 我试过了:
git rebase -Xtheirs
and 和
git rebase -s 'recursive -Xtheirs'
but git rejects -X
in both cases. 但是git在两种情况下都拒绝
-X
。
git rebase -Xtheirs
works in recent versions, except tree conflicts need to be resolved manually. git rebase -Xtheirs
在最新版本中有效,除了树冲突需要手动解决。 You need to run git rebase -Xtheirs --continue
(with -X
repeated) after resolving those conflicts. 解决这些冲突后,您需要运行
git rebase -Xtheirs --continue
(重复-X
)。
You can use this with Git v1.7.3 or later versions. 您可以在Git v1.7.3或更高版本中使用它。
git rebase --strategy-option theirs ${branch} # Long option
git rebase -X theirs ${branch} # Short option
(which is a short for git rebase --strategy recursive --strategy-option theirs ${branch}
as stated by the documentation ) (这是
git rebase --strategy recursive --strategy-option theirs ${branch}
的缩写,如文档所述 )
From Git v1.7.3 Release Notes: 从Git v1.7.3发行说明:
git rebase --strategy <s>
learned the --strategy-option
/ -X
option to pass extra options that are understood by the chosen merge strategy. git rebase --strategy <s>
学习了--strategy-option
/ -X
选项,以传递所选合并策略可以理解的其他选项。
NB: "Ours" and "theirs" mean the opposite of what they do during a straight merge. 注意: “我们的”和“他们的”是指他们在直接合并期间所做的相反的事情。 In other words, "theirs" favors the commits on the current branch.
换句话说,“他们”赞成当前分支上的提交。
This is for merge strategies that come with their own set of options 这是针对带有各自选项的合并策略
git rebase <branch> -s recursive -X theirs
should work, although this patch mentions (February 2010): 尽管此补丁提到了 (2010年2月),但它应该可以工作:
The manpage says that
git-rebase
supports merge strategies, but the rebase command doesn't know about-X
, and gives the usage when presented with it.联机帮助页上说
git-rebase
支持合并策略,但是rebase命令不了解-X
,并给出了用法。
So if it still doesn't work, it is being debated right now! 因此,如果仍然无法正常运行,则目前正在辩论中!
(supported in recent git) (最近的git支持)
Update from commit db2b3b820e2b28da268cc88adff076b396392dfe (July 2013, git 1.8.4+), 来自提交db2b3b820e2b28da268cc88adff076b396392dfe的更新(2013年7月,git 1.8.4+),
Do not ignore merge options in interactive rebase
不要忽略交互式变基中的合并选项
Merge strategy and its options can be specified in
git rebase
, but with-- interactive
, they were completely ignored.合并策略及其选项可以在指定的
git rebase
,但-- interactive
,他们被完全忽略。Signed-off-by: Arnaud Fontaine
签字人:Arnaud Fontaine
That means -X
and strategy now work with interactive rebase, as well as plain rebase. 这意味着
-X
和strategy现在可以与交互式rebase以及普通rebase一起使用。
As iCrazy said, this feature is only available for git 1.7.3 onwards. 正如iCrazy所说,此功能仅适用于git 1.7.3及更高版本。 So, for the poor souls (like me) still using 1.7.1, I present a solution I did myself:
因此,对于仍然使用1.7.1的可怜的灵魂(像我一样),我提出了自己解决的方案:
git-rebase-theirs git-rebase-他们
It is a very well-polished (and thus long) script, meant for production use: ui options, handles multiple files, check if file actually has conflict markers, etc, but the "core" could be summarized in 2 lines: 这是一个经过精心抛光(因此很长)的脚本,供生产使用:ui选项,处理多个文件,检查文件是否确实具有冲突标记等,但是“核心”可以概括为两行:
cp file file.bak
awk '/^<+ HEAD$/,/^=+$/{next} /^>+ /{next} 1' file.bak > file
And here is the full script: 这是完整的脚本:
#!/bin/bash
#
# git-rebase-theirs - Resolve rebase conflicts by favoring 'theirs' version
#
# Copyright (C) 2012 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# 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. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not see <http://www.gnu.org/licenses/gpl.html>
#Defaults:
verbose=0
backup=1
inplace=0
ext=".bak"
message() { printf "%s\n" "$1" >&2 ; }
skip() { message "skipping ${2:-$file}${1:+: $1}"; continue ; }
argerr() { printf "%s: %s\n" "$myname" "${1:-error}" >&2 ; usage 1 ; }
invalid() { argerr "invalid option: $1" ; }
missing() { argerr "missing${1:+ $1} operand." ; }
usage() {
cat <<- USAGE
Usage: $myname [options] [--] FILE...
USAGE
if [[ "$1" ]] ; then
cat >&2 <<- USAGE
Try '$myname --help' for more information.
USAGE
exit 1
fi
cat <<-USAGE
Resolve git rebase conflicts in FILE(s) by favoring 'theirs' version
When using git rebase, conflicts are usually wanted to be resolved
by favoring the <working branch> version (the branch being rebased,
'theirs' side in a rebase), instead of the <upstream> version (the
base branch, 'ours' side)
But git rebase --strategy -X theirs is only available from git 1.7.3
For older versions, $myname is the solution.
It works by discarding all lines between '<<<<<<< HEAD' and '========'
inclusive, and also the the '>>>>>> commit' marker.
By default it outputs to stdout, but files can be edited in-place
using --in-place, which, unlike sed, creates a backup by default.
Options:
-h|--help show this page.
-v|--verbose print more details in stderr.
--in-place[=SUFFIX] edit files in place, creating a backup with
SUFFIX extension. Default if blank is ""$ext"
--no-backup disables backup
Copyright (C) 2012 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
License: GPLv3 or later. See <http://www.gnu.org/licenses/gpl.html>
USAGE
exit 0
}
myname="${0##*/}"
# Option handling
files=()
while (( $# )); do
case "$1" in
-h|--help ) usage ;;
-v|--verbose ) verbose=1 ;;
--no-backup ) backup=0 ;;
--in-place ) inplace=1 ;;
--in-place=* ) inplace=1
suffix="${1#*=}" ;;
-* ) invalid "$1" ;;
-- ) shift ; break ;;
* ) files+=( "$1" ) ;;
esac
shift
done
files+=( "$@" )
(( "${#files[@]}" )) || missing "FILE"
ext=${suffix:-$ext}
for file in "${files[@]}"; do
[[ -f "$file" ]] || skip "not a valid file"
if ((inplace)); then
outfile=$(tempfile) || skip "could not create temporary file"
trap 'rm -f -- "$outfile"' EXIT
cp "$file" "$outfile" || skip
exec 3>"$outfile"
else
exec 3>&1
fi
# Do the magic :)
awk '/^<+ HEAD$/,/^=+$/{next} /^>+ /{next} 1' "$file" >&3
exec 3>&-
((inplace)) || continue
diff "$file" "$outfile" >/dev/null && skip "no conflict markers found"
((backup)) && { cp "$file" "$file$ext" || skip "could not backup" ; }
cp "$outfile" "$file" || skip "could not edit in-place"
((verbose)) && message "resolved ${file}"
done
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.