Hi, I'm really surprised that git can't merge following simple scenario:
branch1 contains xxx.txt with " 5 spaces before" branch2 contains xxx.txt with " 5 spaces before" master contains xxx.txt with " 5 spaces before" now I change it: branch1 contains xxx.txt with " 5 spaces before with a change" branch2 contains xxx.txt with " 5 spaces before" (one space removed) master contains xxx.txt with " 5 spaces before" now I want to merge it: master <- branch2 is OK master <- branch1 gives an error? I wonder why git can't detect it's only a white space change and go along? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/5x-29AGqxisJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
