From 0f521fa2fdc0b3efbf557c42ac1ed275df02a8b9 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 27 Nov 2013 22:47:55 +0800
Subject: [PATCH] Changes to make forking easier and less conflicts

---
 .gitignore      |  1 +
 README.md       | 29 ++++++++++++++++++++++-------
 life.example.md |  8 ++++++++
 life.md         | 22 ----------------------
 4 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 life.example.md
 delete mode 100644 life.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..76912b7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+life.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 32c94c8..cf14256 100644
--- a/README.md
+++ b/README.md
@@ -25,15 +25,30 @@ How to setup your own *Life*
 ----------------------------
 
 1. Fork this project.
-2. Edit `life.md`.
-3. Push to `gh-pages` branch and publish to [GitHub Pages](http://pages.github.com/).
+2. `git checkout -b gh-pages` (or any branch name you like)
+3. Make a copy `life.example.md`, rename it to `life.md`.
+4. Add your life events into `life.md`.
+5. `git push origin gh-pages` and publish to [GitHub Pages](http://pages.github.com/).
 
-Special datetime formats
-------------------------
+How to upgrade your *Life*
+--------------------------
 
-- `2001-2005`, `10/2001-02/03/2005` - Within the two dates
-- `~2005` - Around the time in that year
-- `2005-~` - From that year and beyond (now).
+1. `git checkout master`
+2. `git remote add cheeaun https://github.com/cheeaun/life.git`
+3. `git fetch cheeaun` and `git merge cheeaun/master` to upgrade to latest Life.
+4. `git checkout gh-pages` and `git merge master` to sync changes back to GitHub Pages.
+
+[Learn more](https://help.github.com/articles/fork-a-repo).
+
+Datetime "syntax"
+-----------------
+
+- `2000` - event that happen in that year
+- `01/2000` - event that happen in that month/year
+- `01/01/2000` - event that happen exactly in that date/month/year
+- `2001-2005`, `10/2001-02/03/2005` - event that happen within the two dates
+- `~2005` - event that happen around the time in that year
+- `2005-~` - event that happen from that year and beyond (now).
 
 License
 -------
diff --git a/life.example.md b/life.example.md
new file mode 100644
index 0000000..42c5317
--- /dev/null
+++ b/life.example.md
@@ -0,0 +1,8 @@
+@USERNAME' life
+===============
+
+- 24/02/1955 Born
+- ~1968 Summer job
+- 03/1976 Built a computer
+- 01/04/1976 Started a company
+- 04/1976-2011 Whole bunch of interesting events
\ No newline at end of file
diff --git a/life.md b/life.md
deleted file mode 100644
index 811c926..0000000
--- a/life.md
+++ /dev/null
@@ -1,22 +0,0 @@
-@cheeaun's life
-===============
-
-- 20/06/1985 Born
-- 1991 Kindergarten
-- 1992-1997 Primary school - SKSJ
-- 1998-2000 Secondary school - SMKTI
-- ~2000 First computer
-- 2001-2002 Secondary school - SMKDOB
-- 04/11/2002 Phoenity is born
-- 2003-2004 Secondary school (Form 6) - SMKDOB
-- 01/2005-03/2005 First (non-technical) job
-- 08/2005-08/2008 University - UTAR
-- 11/2005 Dead hard drive of first computer
-- 07/2006-05/2007 CSS Web Designer - MindValley
-- 18/12/2006 First tweet
-- 04/2007 First laptop (HP)
-- 06/2008-07/2009 Web Developer - ZoeCity
-- 24/08/2009-26/06/2013 Front-End Developer - Wego
-- 07/2010 Second laptop (Dell)
-- 04/03/2012 HackerWeb featured on Hacker News' front page
-- 01/07/2013-~ Software Engineer - Viki
\ No newline at end of file