Comments (4)
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.
from codeigniter-bootstrap.
Rather, fetch and rebase upstream from the origin master?
http://robots.thoughtbot.com/keeping-a-github-fork-updated
from codeigniter-bootstrap.
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
.
from codeigniter-bootstrap.
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.
from codeigniter-bootstrap.
Related Issues (20)
- I think its newer been worked HOT 2
- Missing bootstrap-responsive.min.css file HOT 1
- "get_controller()", "get_function()" and "get_parameters()" are missing. HOT 2
- Glyphicons HOT 3
- Not able to find database HOT 1
- Form Horizontal Issue HOT 5
- Integration with HMVC HOT 1
- Update WIKI HOT 1
- Update to 2.2.0 HOT 3
- Upgrade broke package HOT 2
- Compatibility to Codeigniter 3.0 RC2? HOT 5
- After installing, attempting to load the Welcome controller gives an error. HOT 2
- How to create codeigniter cron job in windows task scheduler HOT 1
- Returned an error at the end of make HOT 2
- FA_VERSION=4.6.2 404
- jQuery missing in assets after compile->unzip HOT 1
- Loading pagination library causes Undefined property: CI_Loader::$uri error HOT 2
- Oauth (facebook & twitter) HOT 3
- "icon-caret" shows up in submenu list items HOT 4
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from codeigniter-bootstrap.