welcome to the msysGit mailing list. This list is about the native
port of Git to Windows.
Postings are open to the public, but moderated. New members are also
moderated, because of an unfavorable spam/non-spam ratio. Please excuse
the inconvenience.
The main page for the project is at http://msysgit.googlecode.com/, and we
welcome constructive comments and help. And of course we welcome praise,
too :-).
The msysGit Team
as a follow-up to the welcome message, it seems necessary to lay down some
list rules:
- it is a simple matter of courtesy to quote _just_ the parts of the email
you are replying to, and to refer to them _after_ the quoted text.
(Yes, that means "do not top-post".)
Otherwise, it will be hard to keep track of mail threads, and you will
also force a lot of people to waste their time on reading things that
are not relevant.
- again, as a simple matter of courtesy, _do_ reply-to-all (often referred
to as "Cc: the OPs!").
Remember, some of the members of this list get more than 200 mails per
day. Some days, they are not able to read all of them, so they will have
to prioritize -- guess which mails may get lost in the noise? Exactly.
Of course, if you are keen on your reply _not_ reaching the person you
are responding to, by all means, do not Cc: that person.
- refrain from using profane language, or from sending mails that do not
add value. This is particularly true if you just want to spread bad
feelings: don't.
Of course, this does _not_ mean funny mails. Lightening up the
conversation does add value. After all, most of the people doing all
the work are here for fun.
Keep in mind: if you disagree with these simple rules, you only display a
lack of respect to the other members of the list.
Ciao,
Dscho
您好,欢迎到msysGit邮件列表。这份名单是有关本地
的Git到Windows端口。帖子是向公众开放,但主持。新成员也
放缓,因为不利的垃圾邮件/非垃圾邮件比例。请原谅
不便。该项目的主页是http://msysgit.googlecode.com/,我们
欢迎建设性的意见和帮助。当然,我们欢迎好评,
太:-)。该msysGit团队
嗨列表,作为后续行动的欢迎消息,似乎有必要放下一些
列表的规则:-这是礼貌的一个简单的事情引述_just_电子邮件的部分
你回答,并指他们_after_引用的文本。
(是的,这意味着“不顶帖”。)否则,这将是很难跟踪的邮件线程,你将
也迫使很多人浪费自己的时间在阅读的东西,
是不相关的。-再次,作为礼貌一件简单的事情,_do_回复到所有(通常称为
为“抄送:OP的!”)。请记住,有些该列表的成员每人获得200多个邮件
一天。有些日子,他们不能够读取所有的人,所以他们将有
优先-猜测哪些邮件可能会被淹没在噪音?没错。当然,如果你是热衷于你的答复_not_达到你的人
正在响应,通过各种手段,不要抄送:那个人。-使用亵渎语言避免,或发送邮件不
增加价值。这是尤其如此,如果你只是想传播不良
感受:不知道。当然,这并_不_意味着搞笑邮件。减轻了
谈话确实增加值。毕竟,大多数人做所有的
工作在这里的乐趣。请记住:如果您不同意这些简单的规则,你只能显示一个
缺乏尊重,以列表的其他成员。你好,
Dscho
于2013年1月10日08:00,< MAJ ... @ gmail.com >写道:
>您好,
>
>原谅我,如果这里报告错误,但我是不是真的能找到
>合适的论坛开始讨论。
>在GIT桂有,它并运行BC3合并工具走错了路的错误。
>我可以给你举个例子:
>
>> git的mergetool
> ... (运行过程中,这是确定):
>“C:\ Program Files文件\无法比拟的3 \ bcomp.exe”./setup2.LOCAL.10052
> ./setup2.REMOTE.10052 ./setup2.BASE.10052-mergeoutput = SETUP2
>
>现在运行相同的使用Git桂:
>“C:\ Program Files文件\无法比拟的3 \ bcomp.exe”./setup2.LOCAL ./setup2.REMOTE
> ./setup2.BASE-mergeoutput = \“SETUP2 \ “
>
>正如你所看到的,mergeoutput被调用\“SETUP2 \”,这是不好的。的
>正确的应该是:
>“C:\ Program Files文件\无法比拟的3 \ bcomp.exe”./setup2.LOCAL ./setup2.REMOTE
> ./setup2.BASE-mergeoutput =“SETUP2”
>
>
>除了比较可以从这个恢复部分,它设置合并输出
>文件到D:\ SETUP2,不是到D:\ <path_to_the_conflict_file> \ SETUP2,这是
。>讨厌 你需要说你怎么安装的git GUI来为您执行此。找 过我看到有一些具体的处理代码中 的lib / mergetool.tcl的BC3 -所以你可以尝试在那里闲逛 ,您可以添加“把标准错误XYZZY”来获得输出,如果你按Ctrl-F2 它将调出Tk的控制台,可以告诉你,输出(和 让你重新编程上飞的应用程序)。它看起来有点像你 喂养它引用的路径,它可能会增加另一套报价。如果 是这样,尝试给它一个不带引号的路径。但是,不知道你是如何 启动其很难确定。
-----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) 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 IDosOrZzCXgcYojoe6KhZEjwvLnJiRE= =XpiM -----END PGP PUBLIC KEY BLOCK-----
--
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msy...@googlegroups.com
To unsubscribe from this group, send email to
msysgit+u...@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
---
You received this message because you are subscribed to a topic in the Google Groups "Git for Windows" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/msysgit/ZxN_V6ujbJI/unsubscribe.
To unsubscribe from this group and all its topics, send an email to msysgit+u...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.