Updating?

[sjlu]

Updating?

[kbjohnson90]

Wouldn't the solution be to pull the updated remote origin repo and merge with your forked project?
I'm still new to Version Control, however, so someone feel free to state otherwise.

[kbjohnson90]

Rather, fetch and rebase upstream from the origin master?
http://robots.thoughtbot.com/keeping-a-github-fork-updated

[gegere]

Correct. This is how I have been keeping my projects up-to-date with any
changes from the community.

$ git pull origin master

Then merge any conflicts using "mergetool" on OS X there are several GUI
tools.

On Dec 18, 2013, at 8:07, "Kyle B. Johnson" [email protected]
wrote:

Wouldn't the solution be to pull the updated remote origin repo and merge
with your forked project?
I'm still new to Version Control, however, so someone feel free to state
otherwise.

—
Reply to this email directly or view it on
GitHubhttps://github.com//issues/25#issuecomment-30843733
.

[sjlu]

If you've used this project before, the only real files you'll need to update is probably index.php, application/views/frontpage.php, the system directory and the assets directory.

You'll also need to notice that we've upgraded twitter bootstrap and if you've used a previous version, your styles will change drastically and most likely some of the classes.

We will have a better migration plan for the future.