Why are my .csproj files getting messed up after a git rebase?

Question

In a .NET C# project which uses GIT for source control, I keep getting malformed csproj files after rebasing to get the most recently commited code. This is my process: - commit my code - build and run tests - rebase to "get latest" - curse the heavens, as the csproj file is screwed up... AGAIN Here's the output on the rebase: ``` D:\GitHub\AwesomeProject>git rebase master First, rewinding head to replay your work on top of it... Applying: added getstatus call Using index info to reconstruct a base tree... M Host/Host.csproj M Host/packages.config M Trees/Trees.csproj M Trees/packages.config M UnitTests/UnitTests.csproj :1229: trailing whitespace.

Accepted Answer

You may want to use a .gitattributes file to use a slightly different merge driver. I have found that this has helped with mine:

```
*.csproj -text merge=union
*.sln -text merge=union
```

You can read more about it here to see if there are options you like better.

You can also tell git to take a little longer thinking about its merges with the `patience` option like this: (read more here)

```
git rebase -s recursive -X patience
```

The only other thing that I can think of is to make sure that you pull code often so that the merges git has to do are smaller.

FYI, if you want you can do a `rebase` on the same line at the same time that you do a pull like this: (and you can still pass in the `recursive` and `patience` options the same)

```
git pull --rebase origin master
```

Why are my .csproj files getting messed up after a git rebase?

Solution

Problem