X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bc63bc9eea8274cdb7bdd289a1253bf418dcbfdd..9bb6a2de837c4df09c3ff6c8066982e7f2f61168:/doc/news/git_push_to_this_wiki/discussion.mdwn?ds=inline

diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn
index 252fe724a..33230c7ef 100644
--- a/doc/news/git_push_to_this_wiki/discussion.mdwn
+++ b/doc/news/git_push_to_this_wiki/discussion.mdwn
@@ -24,3 +24,14 @@ in awful and various ways when it is not the case. Any alternative idea?
 > but I sometimes use `git pull --rebase` to pull changes from a repo. That
 > will rebase your local changes on top of the changes pulled, avoiding the
 > merge commits. I'm sure more involved solutions are possible. --[[Joey]]
+
+> I decided to use my local `master` branch as a copy of `origin/master`
+> (kitenet) and move my local modifications to a separate branch.  I'm using
+> `master` to edit the wiki but there is still the problem of new upstream
+> commits since the last pull.  I already had this problem as Joey had pushed
+> some changes while I was editing locally.  Not knowing about
+> `pull --rebase`, I took the long way out: branch, roll back HEAD, rebase,
+> and merge.  That was too much work...It looks like `pull --rebase` is the
+> way to go. --[[JasonBlevins]]
+
+Awesome ! --[[xma]]