› ›
CRITICAL SECURITY VERSION UPDATE:
https://github.com/daylightstudio/FUEL-CMS/releases/tag/1.4.13

Fuel & Git

conordconord
edited March 2012 in Modules
I'm looking to start new project based on Fuel and will be using Git to manage my code for the first time. I've done some reading and it seems possible to use two different repositories (FUEL's and my personal one) to manage the code using remote upstream and collab. So the end result would be that I can pull updates to the main FUEL code and push my application code changes separately. That way, I don't have to include the full FUEL code in my repository or have to manage FUEL updates manually.

Does anyone have suggestions on how to get this setup initially? Or is this not possible with the way FUEL is setup? Any links or suggestions will be appreciated.

Comments

  • adminadmin
    edited 10:36PM
    What we normally will do is check out from GitHub the latest version of fuel and set it up as a remote repository. Then we add our application specific code and push to a separate project specific repo. So in short, we have one remote repo for FUEL to pull in updates and then another remote repo for our application to push/pull updates that are application specific. This allows us to pull in FUEL updates without having to manually integrate. However, their currently isn't a way to separate your code from FUEL's so you can have separate git repositories.
  • conordconord
    edited 10:36PM
    Thanks - that's what I was looking for. Just wanted to make sure I set it up correctly.
  • eriklharpereriklharper
    edited March 2012
    I have an add-on question to this, and that is how do you see the changes made in Fuel before merging those changes into the application-specific repository?

    I use git fetch and then merge, but I always feel a bit uncomfortable right before merging, because I haven't figured out how to show a comprehensive list of files that have changed to see if I need to make any app-specific overrides after the merge or not.

    Any git tips on how to make that happen?

    Erik
  • conordconord
    edited 10:36PM
    I would love an answer to this as well. I'm guessing there's a slick git approach, but I don't know it.

    For another CI-only project that I'm working on, I cloned the CI project in a separate directory, updated it to the latest version, and then ran a file-diff between the two system directories. I then just manually merged the changes.
  • adminadmin
    edited 10:36PM
    This Stackoverflow post may be of some use:
    http://stackoverflow.com/questions/4944376/how-to-check-real-git-diff-before-merging-from-remote-branch
Sign In or Register to comment.