My company is gearing up to setup a client site. My question is about setting up GIT into our development workflow. Installing the platform requires GIT (https://github.com/orocommerce/orocommerce-application.git), which I don’t want to get rid of for future updates and such. We will have some customizations (theming, plugins/modules, etc). So my question how would I integrate my own Git repo into this site without removing the ability to do future update/upgrades? Any advice?
You can fork the repository on GitHub to your organization (and make it private), or you can clone the repository to any other system or your company source code server. You will be able to pull in new updates from our repository as usual (our repository becomes what they call “upstream” repository for your fork).
Playing around with some git things, here is what I did (my company uses Bitbucket instead of Github). From what I can gather, Github’s “Fork” feature simply renames origin to the original remote path (https://github.com/orocommerce/orocommerce-application.git) to “upstream” and sets “origin” to your own repository.
After that, I have a clean/single commit repo that my company can use to track our changes, but I can always merge upstream/branch into my origin/branch
Does that make sense? Do you think that will work? I’ve not done much multi-remote work before, but I think this will work.
You can have as many remotes in the repository as necessary, and you can rename them as you like.
BitBucket supports cloning from GitHub: – go to Repositories -> Import Repository – type: Git, URL: https://github.com/orocommerce/orocommerce-application.git – check “This is a private …” checkbox – click “Import repository” and in a few seconds you are done.
Now any developer in your team can clone this BitBucket repository, push and pull changes to it:
We collect cookie information with a goal to provide you with the best user experience. By using this website, you agree to our use of cookies. Read Oro Inc.’s Cookie policy.
We collect cookie information with a goal to provide you with the best user experience. By using this website, you agree to our use of cookies. Read Oro Inc.’s Cookie policy.