blocks|key|1876171|text|最终结果|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1876172|此解决方案将合并，以便使用Word+-比较和合并两个版本的文档。进行比较。像这样使用它：|offset|length|1876173|在SourceTree中选择提交|ordered-list-item|1876174|在文件列表中选择一个.docx|1876175|单击极右的齿轮图标|1876176|选择外部Diff|style|BOLD|1876177|您还可以使用Ctrl+%2B+D作为外部Diff的快捷方式。|1876178|缺点|1876179|在SourceTree自己的历史视图中不工作|unordered-list-item|1876180|覆盖外部Diff工具，以防您使用另一个|1876181|设置|1876182|该解决方案基于ForNeVeR/ExtDiff。|1876183|首先创建2个文件：|1876184|CompareWord.cmd|1876185|@echo+off
powershell.exe+-File+"%25~dpn0.ps1"+%25*|code-block|syntax|javascript|1876186|CompareWord.ps1|1876187|param(
++++[string]+$BaseFileName,
++++[string]+$ChangedFileName
)

$ErrorActionPreference+=+'Stop'

function+resolve($relativePath)+{
++++(Resolve-Path+$relativePath).Path
}

$BaseFileName+=+resolve+$BaseFileName
$ChangedFileName+=+resolve+$ChangedFileName

#+Remove+the+readonly+attribute+because+Word+is+unable+to+compare+readonly
#+files:
$baseFile+=+Get-ChildItem+$BaseFileName
if+($baseFile.IsReadOnly)+{
++++$baseFile.IsReadOnly+=+$false
}

#+Constants
$wdDoNotSaveChanges+=+0
$wdCompareTargetNew+=+2

try+{
++++$word+=+New-Object+-ComObject+Word.Application
++++$word.Visible+=+$true
++++$document+=+$word.Documents.Open($BaseFileName,+$false,+$false)
++++$document.Compare($ChangedFileName,+[ref]"Comparison",+[ref]$wdCompareTargetNew,+[ref]$true,+[ref]$true)

++++$word.ActiveDocument.Saved+=+1

++++#+Now+close+the+document+so+only+compare+results+window+persists:
++++$document.Close([ref]$wdDoNotSaveChanges)
}+catch+{
++++Add-Type+-AssemblyName+System.Windows.Forms
++++[System.Windows.Forms.MessageBox]::Show($_.Exception)
}|1876188|发射SourceTree|1876189|打开Tools→Options|1876190|转到Diff选项卡|1876191|在外部Diff+/+Merge→外部Diff工具：下选择自定义|1876192|在Diff命令下：编写到CompareWord.cmd的完整路径，即<your\path\to\>CompareWord.cmd|CODE|1876193|在参数下：写\"$LOCAL\"+\"$REMOTE\"|1876194|单击OK保存设置|1876195|entityMap|0|LINK|mutability|MUTABLE|url|https://support.microsoft.com/en-us/office/compare-and-merge-two-versions-of-a-document-f5059749-a797-4db7-a8fb-b3b27eb8b87e|1|https://github.com/ForNeVeR/ExtDiff^0|0|D|J|0|0|0|0|0|2|6|0|6|8|G|6|0|0|2|0|0|2|8|0|0|7|G|1|0|0|0|F|0|0|0|F|0|0|0|2|5|8|7|0|2|4|0|1|E|G|9|S|3|0|1|8|Y|U|0|1|4|6|M|0|2|2|0^^$0|@$1|2|3|4|5|6|7|25|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|26|8|@]|9|@$D|27|E|28|1|29]]|A|$]]|$1|F|3|G|5|H|7|2A|8|@]|9|@]|A|$]]|$1|I|3|J|5|H|7|2B|8|@]|9|@]|A|$]]|$1|K|3|L|5|H|7|2C|8|@]|9|@]|A|$]]|$1|M|3|N|5|H|7|2D|8|@$D|2E|E|2F|O|P]]|9|@]|A|$]]|$1|Q|3|R|5|6|7|2G|8|@$D|2H|E|2I|O|P]|$D|2J|E|2K|O|P]]|9|@]|A|$]]|$1|S|3|T|5|6|7|2L|8|@$D|2M|E|2N|O|P]]|9|@]|A|$]]|$1|U|3|V|5|W|7|2O|8|@]|9|@]|A|$]]|$1|X|3|Y|5|W|7|2P|8|@$D|2Q|E|2R|O|P]]|9|@]|A|$]]|$1|Z|3|10|5|6|7|2S|8|@]|9|@]|A|$]]|$1|11|3|12|5|6|7|2T|8|@]|9|@$D|2U|E|2V|1|2W]]|A|$]]|$1|13|3|14|5|6|7|2X|8|@]|9|@]|A|$]]|$1|15|3|16|5|6|7|2Y|8|@$D|2Z|E|30|O|P]]|9|@]|A|$]]|$1|17|3|18|5|19|7|31|8|@]|9|@]|A|$1A|1B]]|$1|1C|3|1D|5|6|7|32|8|@$D|33|E|34|O|P]]|9|@]|A|$]]|$1|1E|3|1F|5|19|7|35|8|@]|9|@]|A|$1A|1B]]|$1|1G|3|1H|5|H|7|36|8|@]|9|@]|A|$]]|$1|1I|3|1J|5|H|7|37|8|@$D|38|E|39|O|P]|$D|3A|E|3B|O|P]]|9|@]|A|$]]|$1|1K|3|1L|5|H|7|3C|8|@$D|3D|E|3E|O|P]]|9|@]|A|$]]|$1|1M|3|1N|5|H|7|3F|8|@$D|3G|E|3H|O|P]|$D|3I|E|3J|O|P]|$D|3K|E|3L|O|P]]|9|@]|A|$]]|$1|1O|3|1P|5|H|7|3M|8|@$D|3N|E|3O|O|P]|$D|3P|E|3Q|O|1Q]]|9|@]|A|$]]|$1|1R|3|1S|5|H|7|3R|8|@$D|3S|E|3T|O|P]|$D|3U|E|3V|O|1Q]]|9|@]|A|$]]|$1|1T|3|1U|5|H|7|3W|8|@$D|3X|E|3Y|O|P]]|9|@]|A|$]]|$1|1V|3|-4|5|6|7|3Z|8|@]|9|@]|A|$]]]|1W|$1X|$5|1Y|1Z|20|A|$21|22]]|23|$5|1Y|1Z|20|A|$21|24]]]]

<h1>End result</h1>
This solution will merge for comparison using the <a href="https://support.microsoft.com/en-us/office/compare-and-merge-two-versions-of-a-document-f5059749-a797-4db7-a8fb-b3b27eb8b87e" rel="nofollow noreferrer">Word - Compare and merge two versions of a document</a>. Using it like this:
<ol>
<li>Select a commit in SourceTree</li>
<li>Select a .docx in the file list</li>
<li>Click the gear icon to the far right</li>
<li>Select External Diff</li>
</ol>
You can also use Ctrl + D as a shortcut for External Diff
Drawbacks
<ul>
<li>Does not work in SourceTree's own History view</li>
<li>Overwrites the External Diff Tool in case you are using another</li>
</ul>
<h1>Setup</h1>
This solution is based on <a href="https://github.com/ForNeVeR/ExtDiff" rel="nofollow noreferrer">ForNeVeR/ExtDiff</a>.
First you create 2 files:
CompareWord.cmd
<pre><code>@echo off
powershell.exe -File &quot;%~dpn0.ps1&quot; %*
</code></pre>
CompareWord.ps1
<pre><code>param(
 [string] $BaseFileName,
 [string] $ChangedFileName
)

$ErrorActionPreference = 'Stop'

function resolve($relativePath) {
 (Resolve-Path $relativePath).Path
}

$BaseFileName = resolve $BaseFileName
$ChangedFileName = resolve $ChangedFileName

# Remove the readonly attribute because Word is unable to compare readonly
# files:
$baseFile = Get-ChildItem $BaseFileName
if ($baseFile.IsReadOnly) {
 $baseFile.IsReadOnly = $false
}

# Constants
$wdDoNotSaveChanges = 0
$wdCompareTargetNew = 2

try {
 $word = New-Object -ComObject Word.Application
 $word.Visible = $true
 $document = $word.Documents.Open($BaseFileName, $false, $false)
 $document.Compare($ChangedFileName, [ref]&quot;Comparison&quot;, [ref]$wdCompareTargetNew, [ref]$true, [ref]$true)

 $word.ActiveDocument.Saved = 1

 # Now close the document so only compare results window persists:
 $document.Close([ref]$wdDoNotSaveChanges)
} catch {
 Add-Type -AssemblyName System.Windows.Forms
 [System.Windows.Forms.MessageBox]::Show($_.Exception)
}
</code></pre>
<ol>
<li>Launch SourceTree</li>
<li>Open Tools → Options</li>
<li>Go to the Diff tab</li>
<li>Under External Diff / Merge → External Diff Tool: choose Custom</li>
<li>Under Diff Command: write the full path to the CompareWord.cmd, i.e. <code>&lt;your\path\to\&gt;CompareWord.cmd</code></li>
<li>Under Arguments: write <code>\&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;</code></li>
<li>Click OK to save your settings</li>
</ol>

I would like to see git diff of Word .docx files in SourceTree on Windows.
Per default they shows up like this:
<img src="https://i.stack.imgur.com/ZaJrM.png" alt="Word .docx files in SourceTree history" />
I have tried <a href="https://stackoverflow.com/questions/32734617/diff-word-docx-files-in-sourcetree-on-windows-7">changing .gitattributes and .git\config</a> but it does not work for the history in SourceTree. This sadly seems like a limitation in SourceTree <a href="https://jira.atlassian.com/browse/SRCTREEWIN-1416" rel="nofollow noreferrer">1</a>, <a href="https://stackoverflow.com/questions/30680291/custom-diff-by-textconv-in-sourcetree">2</a>
Are there any ways to get a diff for Word .docx files in SourceTree on Windows?

How to git diff Word docx files in Sourcetree on Windows

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我想看看.docx上的Word文件在SourceTree中的差异。默认情况下，它们的显示方式如下：​我尝试过，但它不适用于SourceTree的历史。可悲的是，这似乎是SourceTree ，的一个限制。有什么方法可以在.docx上的SourceTree中获得Word文件的差异吗？

如何在Windows下的Sourcetree中对Word docx文件进行分类-腾讯云开发者社区-腾讯云

问如何在Windows下的Sourcetree中对Word docx文件进行分类
EN

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Windows下的Sourcetree中对Word docx文件进行分类EN

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Windows下的Sourcetree中对Word docx文件进行分类
EN