合并策略仅更改空格？

问题描述

我在master分支中做了一种代码格式。它主要解决了空白问题，例如：格式化制表符空格的长度，在大括号之前和之后添加和删除换行符。问题是，当我尝试合并其他分支的master时，会遇到很多冲突。是否有一些策略可以将空格更改引入其他分支？

I did a code format in master branch. It mainly fixed whitespace issues like: formatting tab space lengths, adds and removes newlines before and after braces. The problem is, when I try to merge master from other branches I get a lot of conflicts. Is there some strategy to bring in whitespace changes to other branches?

推荐答案

来自，我认为

From the docs of git merge, I would assume that

git merge -s recursive -Xignore-space-change

可用于实现此目的。您可能还想玩

could be used to achieve this. You might also want to play around with

• -Xignore-all-space 或


• -Xignore-space-at-eol

• -Xignore-all-space or
• -Xignore-space-at-eol

这篇关于合并策略仅更改空格？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！