Skip to content

Commit

Permalink
Merge pull request #270 from adamralph/various
Browse files Browse the repository at this point in the history
added note about force pushing a rebased branch and removed some redunda...
  • Loading branch information
blairconrad committed Mar 3, 2014
2 parents 188f74b + f4cc966 commit 81eda13
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Expand Up @@ -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.

Expand Down
1 change: 0 additions & 1 deletion Source/FakeItEasy.nuspec
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions 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" />
</Rules>
</RuleSet>

0 comments on commit 81eda13

Please sign in to comment.