Groups
Sign in
Groups
Git中文用户组
Conversations
About
Send feedback
Help
如何在冲突的时候用指定某个版本的方式手动解决冲突?
31 views
Skip to first unread message
Chunlin Zhang
unread,
May 18, 2011, 6:00:13 AM
5/18/11
Reply to author
Sign in to reply to author
Forward
Sign in to forward
Delete
You do not have permission to delete messages in this group
Copy link
Report message
Show original message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to Git中文用户组
例如是二进制文件的冲突,我想要手动指定remote的版本,用什么命令指定?
aleip...@gmail.com
unread,
May 18, 2011, 6:22:34 AM
5/18/11
Reply to author
Sign in to reply to author
Forward
Sign in to forward
Delete
You do not have permission to delete messages in this group
Copy link
Report message
Show original message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to git...@googlegroups.com
在merge发生冲突的时候,使用
git checkout --theirs <foobar>
来选择remote的版本
2011/5/18 Chunlin Zhang
<
zhangc...@gmail.com
>
例如是二进制文件的冲突,我想要手动指定remote的版本,用什么命令指定?
--
This mail is sent using Gmail web.
Contact:
twitter: AReverie
Chunlin Zhang
unread,
May 18, 2011, 10:53:33 PM
5/18/11
Reply to author
Sign in to reply to author
Forward
Sign in to forward
Delete
You do not have permission to delete messages in this group
Copy link
Report message
Show original message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to git...@googlegroups.com
果然可以,谢谢!
这个在 git help merge 的文档里都没提,找来找去都找不到
2011/5/18
aleip...@gmail.com
<
aleip...@gmail.com
>:
Reply all
Reply to author
Forward
0 new messages