From: Dave Rolsky <autarch@urth.org>
Date: Wed, 24 Nov 2010 21:21:35 +0000 (-0600)
Subject: Really fix ocnflicts
X-Git-Tag: 1.21~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=71dd0faa9e8e64146ca7f0167667db3191a1bf3a;p=gitmo%2FMoose.git

Really fix ocnflicts
---

diff --git a/lib/Moose/Manual/Contributing.pod b/lib/Moose/Manual/Contributing.pod
index c8f2105..f164abf 100644
--- a/lib/Moose/Manual/Contributing.pod
+++ b/lib/Moose/Manual/Contributing.pod
@@ -239,31 +239,21 @@ defend your change.
 =head1 RELEASE WORKFLOW
 
     git checkout master
-<<<<<<< HEAD
-=======
 
     # minor releases
     git checkout stable/X.YY
 
->>>>>>> c5d6da2... Tweaks to clarify stable branch naming scheme.
     # edit for final version bumping, changelogging, etc
     # prepare release (test suite etc)
     perl-reversion -bump
     make manifest
     git commit
-<<<<<<< HEAD
-    git checkout stable
-    git merge master # must be a fast forward
-    git push both
-=======
     git branch stable/X.YY # only for non-trial major releases
->>>>>>> c5d6da2... Tweaks to clarify stable branch naming scheme.
     shipit # does not ship the tarball, but does everything else
     cpan-upload ~/shipit-dist/Moose-X.YZ.tar.gz
 
-<<<<<<< HEAD
 Development releases are made without merging into the stable branch.
-=======
+
     # non-trial releases
     cpan-upload ~/shipit-dist/Moose-X.YYZZ.tar.gz
 
@@ -271,7 +261,6 @@ Development releases are made without merging into the stable branch.
     cd ~/shipit-dist
     mv Moose-X.YYZZ.tar.gz Moose-X.YYZZ-TRIAL.tar.gz
     cpan-upload Moose-X.YYZZ-TRIAL.tar.gz
->>>>>>> c5d6da2... Tweaks to clarify stable branch naming scheme.
 
 =head2 Release How-To
 
@@ -313,12 +302,6 @@ Anyone can create the necessary fix by branching off of the stable branch:
     # hack
     git commit
 
-<<<<<<< HEAD
-Then a cabal member merges into stable:
-
-    git checkout stable
-    git merge topic/my-emergency-fix
-=======
 Then a cabal member merges into C<master>, and backports the change into
 C<stable/X.YY>:
 
@@ -327,11 +310,6 @@ C<stable/X.YY>:
     git push
     git checkout stable/X.YY
     git cherry-pick -x master
->>>>>>> c5d6da2... Tweaks to clarify stable branch naming scheme.
-    git push
-    # release
-    git checkout master
-    git merge stable
 
 =head1 PROJECT WORKFLOW