Feature csprojconventions

[ewilde]

Implement configuration convention Closes #58

[JakeGinnivan]

Ah, didn't notice the commit on the other one :)

[JakeGinnivan]

Can you rebase your PR

git fetch upstream
git rebase upstream/master
git push origin feature-csprojconventions -f

I have fixed .gitattributes and hopefully that fixes your PR up :)

[ewilde]

Tried the rebase commands, got some failures. I'm hitting the limits of my git knowledge here :) Any pointers? I'll google around in the mean time

ewilde@CLINTON-DESKTOP /c/dev/ConventionTests (feature-csprojconventions)
$ git fetch upstream

ewilde@CLINTON-DESKTOP /c/dev/ConventionTests (feature-csprojconventions)
$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Implement configuration convention Closes #58
Using index info to reconstruct a base tree...
error: patch failed: Samples/SampleApp.Tests/SampleApp.Tests.csproj:31
error: Samples/SampleApp.Tests/SampleApp.Tests.csproj: patch does not apply
error: patch failed: Samples/SampleApp.Tests/packages.config:1
error: Samples/SampleApp.Tests/packages.config: patch does not apply
error: patch failed: Samples/SampleApp/SampleApp.csproj:50
error: Samples/SampleApp/SampleApp.csproj: patch does not apply
error: patch failed: TestAssembly/TestAssembly.csproj:55
error: TestAssembly/TestAssembly.csproj: patch does not apply
error: patch failed: TestStack.ConventionTests.Tests/ProjectBasedConventions.cs:74
error: TestStack.ConventionTests.Tests/ProjectBasedConventions.cs: patch does not apply
error: patch failed: TestStack.ConventionTests.Tests/Properties/Resources.Designer.cs:1
error: TestStack.ConventionTests.Tests/Properties/Resources.Designer.cs: patch does not apply
error: patch failed: TestStack.ConventionTests.Tests/Properties/Resources.resx:1
error: TestStack.ConventionTests.Tests/Properties/Resources.resx: patch does not apply
error: patch failed: TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj:62
error: TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 Implement configuration convention Closes #58
The copy of the patch that failed is found in:
   c:/dev/ConventionTests/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".


ewilde@CLINTON-DESKTOP /c/dev/ConventionTests (feature-csprojconventions|REBASE 1/3)
$

[JakeGinnivan]

Basically that commit is just line ending changes, it is trying to apply them, and they no longer apply. Try

git add -A
git rebase --continue

If that says there is nothing to commit, try git rebase --skip which will just drop that commit

[ewilde]

thanks for the pointers, went through the rebase, still hit a will of pink! really not sure what's going on :(

[JakeGinnivan]

All good, I will sort it :)