From 5fb4ef916fab699c5d29a0d309eb5d6611348d4f Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 27 Feb 2014 11:05:30 +0100 Subject: [PATCH] added how to update the wiki pages in the README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index d55b87f2..023b2801 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,10 @@ Eiffel Web Framework's documentation, included in this repo in the root director 3. Open [http://localhost:9000](http://localhost:9000) in your browser, and voilĂ . Learn more about using Jekyll by reading their [documentation](http://jekyllrb.com/docs/home/). + +### Update the wiki pages +1. git remote add -f ewf_wiki https://github.com/EiffelWebFramework/EWF.wiki.git +2. git merge -s ours --no-commit --squash ewf_wiki/master +3. git pull -X subtree=wiki ewf_wiki master +4. then git commit if needed +