1
Vote

Indentation errors after performing git merge

description

When merging Git branches using Microsoft's own Git source control plug-in, my source files are left with numerous indentation errors.

file attachments

comments

Artfunkel wrote Aug 10 at 6:11 PM

Oops, submitted too early.

What I was going to point out was the line directly below the first diff block in the Source revision: it is indented by four tabs, which is correct, while the Target revision only has three. The result has three indents, which is wrong.

I would put this down to an error in the plug-in except that in C# there is no such problem. Is there some sort of document formatting step in the Git plug-in that isn't being triggered for Python?

This is not an issue when merging with Git proper.

Zooba wrote Aug 10 at 8:58 PM

That's very strange, we should test whether the same thing happens with TFS.

For our part, all we should be doing there is the syntax highlighting, but if something else is going on we need to deal with it or pass it on to the responsible team.

Artfunkel wrote Aug 15 at 5:10 PM

Another possibly related annoyance is that you can't edit your file in Compare view, although you can trigger the intellisense pop-up.

Editing works with other languages.

Artfunkel wrote Aug 15 at 8:39 PM

Another potential lead: if you create an init method using autocomplete, it will generate a stub method for you. The body of the method will not be indented.