Mixing
Git merge ignore blank lines
up vote
0
down vote
favorite
I am attempting to Git merge between two different repositories. Theoretically they very similar but different practices on both have resulted in numerous whitespace differences in almost every file.
I can get the results I expect with "git diff -w -ignore-blank-lines" which does show only the files where there are genuine differences. However, Git merge does not have the same options and "git merge -Xignore-space-change" still results in thousands of whitespace only differences.
The repositories have 40 folders and almost 20k files so I'm keen to have an accurate and automated way of merging them as this process will be repeated.
I also can configure a merge tool to ignore such changes but the process is still quite slow. Ideally I'd use a "git merge -w -ignore-blank-lines" but this does not seem to be possible.
Any assistance appreciated.
git github git-merge
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
up vote
0
down vote
favorite
I am attempting to Git merge between two different repositories. Theoretically they very similar but different practices on both have resulted in numerous whitespace differences in almost every file.
I can get the results I expect with "git diff -w -ignore-blank-lines" which does show only the files where there are genuine differences. However, Git merge does not have the same options and "git merge -Xignore-space-change" still results in thousands of whitespace only differences.
The repositories have 40 folders and almost 20k files so I'm keen to have an accurate and automated way of merging them as this process will be repeated.
I also can configure a merge tool to ignore such changes but the process is still quite slow. Ideally I'd use a "git merge -w -ignore-blank-lines" but this does not seem to be possible.
Any assistance appreciated.
git github git-merge
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
up vote
0
down vote
favorite
up vote
0
down vote
favorite
I am attempting to Git merge between two different repositories. Theoretically they very similar but different practices on both have resulted in numerous whitespace differences in almost every file.
I can get the results I expect with "git diff -w -ignore-blank-lines" which does show only the files where there are genuine differences. However, Git merge does not have the same options and "git merge -Xignore-space-change" still results in thousands of whitespace only differences.
The repositories have 40 folders and almost 20k files so I'm keen to have an accurate and automated way of merging them as this process will be repeated.
I also can configure a merge tool to ignore such changes but the process is still quite slow. Ideally I'd use a "git merge -w -ignore-blank-lines" but this does not seem to be possible.
Any assistance appreciated.
git github git-merge
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
I am attempting to Git merge between two different repositories. Theoretically they very similar but different practices on both have resulted in numerous whitespace differences in almost every file.
I can get the results I expect with "git diff -w -ignore-blank-lines" which does show only the files where there are genuine differences. However, Git merge does not have the same options and "git merge -Xignore-space-change" still results in thousands of whitespace only differences.
The repositories have 40 folders and almost 20k files so I'm keen to have an accurate and automated way of merging them as this process will be repeated.
I also can configure a merge tool to ignore such changes but the process is still quite slow. Ideally I'd use a "git merge -w -ignore-blank-lines" but this does not seem to be possible.
Any assistance appreciated.
git github git-merge
git github git-merge
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
asked yesterday
Ian Simpkins
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
asked yesterday
Ian Simpkins
1
asked yesterday
Ian Simpkins
1
1
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
New contributor
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
Ian Simpkins is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
up vote
0
down vote
The reason you've got genuine difference from git diff is not from ignore-space-change, it's from -w and it's equivalent to -Xignore-all-space.
So try git merge -Xignore-all-space, but it might be a better idea to review the difference before finishing the merge because ignoring all space option sometimes create wrong indentation.
answered yesterday
ik1ne
465
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
add a comment |
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
up vote
0
down vote
The reason you've got genuine difference from git diff is not from ignore-space-change, it's from -w and it's equivalent to -Xignore-all-space.
So try git merge -Xignore-all-space, but it might be a better idea to review the difference before finishing the merge because ignoring all space option sometimes create wrong indentation.
answered yesterday
ik1ne
465
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
add a comment |
up vote
0
down vote
The reason you've got genuine difference from git diff is not from ignore-space-change, it's from -w and it's equivalent to -Xignore-all-space.
So try git merge -Xignore-all-space, but it might be a better idea to review the difference before finishing the merge because ignoring all space option sometimes create wrong indentation.
answered yesterday
ik1ne
465
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
add a comment |
up vote
0
down vote
up vote
0
down vote
The reason you've got genuine difference from git diff is not from ignore-space-change, it's from -w and it's equivalent to -Xignore-all-space.
So try git merge -Xignore-all-space, but it might be a better idea to review the difference before finishing the merge because ignoring all space option sometimes create wrong indentation.
answered yesterday
ik1ne
465
The reason you've got genuine difference from git diff is not from ignore-space-change, it's from -w and it's equivalent to -Xignore-all-space.
So try git merge -Xignore-all-space, but it might be a better idea to review the difference before finishing the merge because ignoring all space option sometimes create wrong indentation.
answered yesterday
ik1ne
465
answered yesterday
ik1ne
465
answered yesterday
ik1ne
465
answered yesterday
ik1ne
465
465
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
add a comment |
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
Thanks for that but I have tried -Xignore-all-space and it still finds lots of differences. Some are indentation differences with spaces or tabs and some are blank lines. It's not too hard to identify the real differences between the files and deal with them, I'd just like to be able to merge and ignore the blanks.
– Ian Simpkins
yesterday
add a comment |
Ian Simpkins is a new contributor. Be nice, and check out our Code of Conduct.
Ian Simpkins is a new contributor. Be nice, and check out our Code of Conduct.
Ian Simpkins is a new contributor. Be nice, and check out our Code of Conduct.
Ian Simpkins is a new contributor. Be nice, and check out our Code of Conduct.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53371977%2fgit-merge-ignore-blank-lines%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
