-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support to preserve formatting (preserve tabs) #13
Comments
Too annoyed to reformat each time merge has been done as the merge driver doesn't support this. balbuf/composer-git-merge-driver#13
@glensc these bits of logic were supposed to match the indentation and preserve the specific type of indentation (and in the case the case of spaces, the appropriate width), but I guess it isn't working properly? It's limited in its ability because it just matches a sample line and extrapolates for the rest of the file, so if there's a mixture of spaces/tabs or other nonstandard indentation (or if the indentation type was changed during the merge), it's not going to faithfully preserve the indentation. If you want to look into what the issue is, those would be the places to start. |
@balbuf thanks for the investigation. I've converted muy files to space indent, so this is no longer bothering me. ps: 🚧 Never link to branches, share a permalink 🚧 |
I have tab indent formatted composer.json, each time composer-git-merge-driver is merging, the formatting is replaced with space indent.
The text was updated successfully, but these errors were encountered: