Permalink
Browse files

Just fixed some indent

  • Loading branch information...
1 parent 7c0eebf commit c0f1e6500fc04fdf2b0229bb6cc3dae5796ee677 @benjaminvialle benjaminvialle committed Apr 13, 2011
Showing with 64 additions and 23 deletions.
  1. +41 −0 GitAdminMergeGuide.rst
  2. +0 −17 Gitadminmergeguide.rst
  3. +12 −2 Gitkeepingpace.rst
  4. +11 −4 Gitrebasefeaturebranch.rst
View
@@ -0,0 +1,41 @@
+Merging MarkUs Pull Requests
+================================================================================
+
+This is what I've been doing for merging things into master so far (feedback
+welcome):
+
+* Clone main MarkUs: ``git clone git@github.com:MarkUsProject/Markus.git``. If
+ you have it cloned, make sure to be on master and pull from origin/master.
+ Note, if you have the repo already cloned, a ``git fetch origin && git
+ checkout master && git rebase origin/master`` should bring you up to date.
+
+* Add remote for fork of developer: ``git remote add
+ <developer-github-name>-fork <read-only-url>``
+
+* Fetch changes in fork: ``git fetch <developer-github-name>-fork``
+
+* Create a local branch tracking the remote branch of the developer: ``git
+ branch <feature-branch-name> <developer-github-name>-fork/<branch-name>``
+
+* Checkout and double-check if everything is in order: ``git checkout
+ <feature-branch-name>``
+
+* Use ``git log``, ``gitk`` or whatever you prefer to make sure feature-branch
+ has nice history based on latest HEAD of origin/master.
+
+* If it isn't, you could try rebasing it or ask the developer to bring it to
+ up-to-date master. You may also fixup some history, squash things and what
+ not (i.e. ``git rebase -i HEAD~<#of-commits-back>`` may be useful).
+
+* If the rebase causes conflicts, it's likely that the developer did not keep
+ up-to-date with HEAD of origin/master (i.e. did not rebase the feature branch
+ on latest HEAD of origin/master. The developer should do the merging if
+ necessary and resolve conflicts (maybe ``git mergetool`` helps).
+
+* Finally merge feature-branch into master: ``git checkout master && git merge
+ <feature-branch-name>``. Ideally, this is only a Fast-forward merge.
+
+* Again, make sure history looks ok. If everything looks good, push to origin:
+ ``git push origin master``
+
+Does this make sense?
View
@@ -1,17 +0,0 @@
-Merging MarkUs Pull Requests
-=======================
-
-This is what I've been doing for merging things into master so far (feedback welcome):
-
-* Clone main MarkUs: ``git clone git@github.com:MarkUsProject/Markus.git``. If you have it cloned, make sure to be on master and pull from origin/master. Note, if you have the repo already cloned, a ``git fetch origin && git checkout master && git rebase origin/master`` should bring you up to date.
-* Add remote for fork of developer: ``git remote add <developer-github-name>-fork <read-only-url>``
-* Fetch changes in fork: ``git fetch <developer-github-name>-fork``
-* Create a local branch tracking the remote branch of the developer: ``git branch <feature-branch-name> <developer-github-name>-fork/<branch-name>``
-* Checkout and double-check if everything is in order: ``git checkout <feature-branch-name>``
-* Use ``git log``, ``gitk`` or whatever you prefer to make sure feature-branch has nice history based on latest HEAD of origin/master.
-* If it isn't, you could try rebasing it or ask the developer to bring it to up-to-date master. You may also fixup some history, squash things and what not (i.e. ``git rebase -i HEAD~<#of-commits-back>`` may be useful).
-* If the rebase causes conflicts, it's likely that the developer did not keep up-to-date with HEAD of origin/master (i.e. did not rebase the feature branch on latest HEAD of origin/master. The developer should do the merging if necessary and resolve conflicts (maybe ``git mergetool`` helps).
-* Finally merge feature-branch into master: ``git checkout master && git merge <feature-branch-name>``. Ideally, this is only a Fast-forward merge.
-* Again, make sure history looks ok. If everything looks good, push to origin: ``git push origin master``
-
-Does this make sense?
View
@@ -1,5 +1,15 @@
Keeping Your Personal Fork-Clone Up-to-date
=================================
-* Add the ``upstream`` remote: ``git remote add upstream git://github.com/MarkUsProject/Markus.git``
+
+* Add the ``upstream`` remote: ``git remote add upstream
+ git://github.com/MarkUsProject/Markus.git``
+
* Fetch changes in MarkUsProject/MarkUs: ``git fetch upstream``
-* Bring ``master`` of your personal fork-clone up-to-date: ``git checkout master && git merge upstream/master``. If you are currently working on a feature branch and upstream ``master`` changed meanwhile, you may want to rebase to HEAD of upstream/master. If this doesn't mean anything to you, you may want to ask for help first. [[GitRebaseFeatureBranch]] may also be of interest.
+
+* Bring ``master`` of your personal fork-clone up-to-date: ``git checkout
+ master && git merge upstream/master``. If you are currently working on a
+ feature branch and upstream ``master`` changed meanwhile, you may want to
+ rebase to HEAD of upstream/master. If this doesn't mean anything to you, you
+ may want to ask for help first. [[GitRebaseFeatureBranch]] may also be of
+ interest.
+
View
@@ -1,8 +1,15 @@
What to do when main MarkUs is further ahead than when I created the branch for my feature/bug?
-=======================================================================
-* If you don't have the "upstream" remote add it: ``git remote add upstream git://github.com/MarkUsProject/Markus.git``
+================================================================================
+
+* If you don't have the "upstream" remote add it: ``git remote add upstream
+ git://github.com/MarkUsProject/Markus.git``
+
* Fetch main MarkUs changes: ``git fetch upstream``
+
* Switch to your feature branch: ``git checkout <feature-branch-name>``
-* Rebase your feature branch on current HEAD of upstream/master: ``git rebase upstream/master``.
-If this doesn't say anything to you, ask for help. Seriously, ask for help! There's always somebody around to clarify things :)
+* Rebase your feature branch on current HEAD of upstream/master: ``git rebase
+ upstream/master``.
+
+If this doesn't say anything to you, ask for help. Seriously, ask for help!
+There's always somebody around to clarify things :)

0 comments on commit c0f1e65

Please sign in to comment.