Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

added note about force pushing a rebased branch and removed some redunda... #270

Merged
merged 1 commit into from

2 participants

@adamralph
Owner

...nt stuff

@blairconrad blairconrad commented on the diff
Source/FakeItEasy.ruleset
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="FakeItEasy" ToolsVersion="11.0">
<Include Path="allrules.ruleset" Action="Default" />
- <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
- <Rule Id="CA2243" Action="None" />
@blairconrad Owner

For my education, where'd this come from? I see where the other two did.

@adamralph Owner

This was for the AssemblyInformationalVersion attribute, which we used to instantiate with a pre-release version, e.g. "1.18.0-beta01", but no longer do.

@blairconrad Owner

Oh. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@blairconrad blairconrad merged commit 81eda13 into FakeItEasy:master
@adamralph adamralph deleted the adamralph:various branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
1  CONTRIBUTING.md
@@ -81,6 +81,7 @@ While you're working away in your branch it's quite possible that your upstream/
1. `git checkout myBranch`
1. `git rebase master myBranch`
1. `git push origin master` - (optional) this this makes sure your remote master is up to date
+1. if you previously pushed your branch to your origin, you need to force push the rebased branch - `git push origin myBranch -f`
This ensures that your history is "clean" i.e. you have one branch off from master followed by your changes in a straight line. Failing to do this ends up with several "messy" merges in your history, which we don't want. This is the reason why you should always work in a branch and you should never be working in, or sending pull requests from, master.
View
1  Source/FakeItEasy.nuspec
@@ -6,7 +6,6 @@
<title>FakeItEasy</title>
<authors>Patrik Hägne, FakeItEasy contributors</authors>
<description>It's faking amazing! The easy mocking framework for .NET that works great in C# and VB.NET alike. No need to know the difference between a stub, a mock or a spy, everything's a fake! The easy to use, refactoring friendly API makes faking a breeze.</description>
- <releaseNotes>TBD</releaseNotes>
<language>en-US</language>
<projectUrl>http://fakeiteasy.github.io/</projectUrl>
<iconUrl>http://fakeiteasy.github.io/img/talkingladies.png</iconUrl>
View
3  Source/FakeItEasy.ruleset
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="FakeItEasy" ToolsVersion="11.0">
<Include Path="allrules.ruleset" Action="Default" />
- <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
- <Rule Id="CA2243" Action="None" />
@blairconrad Owner

For my education, where'd this come from? I see where the other two did.

@adamralph Owner

This was for the AssemblyInformationalVersion attribute, which we used to instantiate with a pre-release version, e.g. "1.18.0-beta01", but no longer do.

@blairconrad Owner

Oh. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
- </Rules>
</RuleSet>
Something went wrong with that request. Please try again.