Jump to content

Recommended Posts

Posted (edited)

John Brockley sent some great info on setting this up.

I have installed SourceTree

Set up my github account

Forked Gary's

Cloned in SourceTree so fork is now local.

Been away for a few months and current up to May 28 - Accessibility.

Created a branch at May 28 - Font Awesome

 Instruction say - Copy your code into this branch. This records it as a set of changes to Gary's "core".

Don't see how to copy my files with all the changes into SourceTree

 

image.png.e02a6c9979519e7a70c659de968bd250.png

Any guidance would be greatly appreciated

 

Doug

 

Edited by Dnj1964

Share this post


Link to post
Share on other sites

If you want to copy files that are not in a repository into your branch, you just drop them on the local directories in file explorer.

If you want to get files from another branch in a repository you have to pull that branch into your repository and merge it into the branch.

Are you trying to do one of these, or something else I haven't thought of?


For a new install or if your store isn't mobile-friendly, get the community-supported responsive osCommerce (Phoenix).

here: on the official osc download page

Working on generalising bespoke solutions for Quickbooks integration, Easify integration and pay4later (DEKO) integration at 2.3.x

Share this post


Link to post
Share on other sites

Sorry I just read your post a bit better and I see it's the first that you're trying to do.

You should make a branch at the version of Gary's that you downloaded - so if that's what you did, then great.

Then copy your site files over the top of the filestore of your local repo where sourcetree is looking. The exact method will depend on where your modified files are - you could be using ftp or just copying them. It's not something you do in Sourcetree, you just use your normal tools for copying files from one place to another.

For example, if I was working on a site that started with the 'Frozen' release, I would:

  1. create a fork of Gary's repo on github
  2. decide where I'm putting the files on my local laptop, eg. a folder called 'dev'
  3. in sourcetree on my laptop, clone the new fork with the repo set to the dev folder - this should download all the files in the master branch from the fork into the dev folder on my laptop
  4. then I create the new branch at the 'Frozen' release

I gather that you've done all this already

My next step would be to use an ftp program to download the whole site into the local dev folder on top of the master files.


For a new install or if your store isn't mobile-friendly, get the community-supported responsive osCommerce (Phoenix).

here: on the official osc download page

Working on generalising bespoke solutions for Quickbooks integration, Easify integration and pay4later (DEKO) integration at 2.3.x

Share this post


Link to post
Share on other sites

Thank you ever so much.

I have forked Gary's master and cloned it into a folder named "CE-Phoenix"

In sourcetree I created a branch at May 28th

So if I am understanding correctly I am to ftp all my files into "CE-Phoenix" folder and overwrite the cloned master files.

Share this post


Link to post
Share on other sites
2 hours ago, Dnj1964 said:

I have forked Gary's master and cloned it into a folder named "CE-Phoenix"

In sourcetree I created a branch at May 28th

So if I am understanding correctly I am to ftp all my files into "CE-Phoenix" folder and overwrite the cloned master files.

Yes, that's right. After doing that you will see in Sourcetree a lot of Unstaged files that show the differences between your files and Gary's. It's worth going through them to check that they are real differences and not just a bit of formatting - you can discard individual lines and groups of lines, to keep the amount of change to a minimum. This is worth doing because it will reduce the number of conflicts you get in the future. You can use the list as a work list and 'stage' each file when you've checked it.

NB if your github repository is public, it's best not to copy your configure and htaccess files into it. Just make sure that the ones in your site are read-only so you don't overwrite them by mistake sometime. If you have already copied them, discard the changes to these files instead of staging them.

When you've been all through them, check that Sourcetree is pointed at your branch (highlighted on the left as it is in your screenshot) and then do a Commit which saves the changes in your branch in your local repo and do a push which copies the branch to your github fork.


For a new install or if your store isn't mobile-friendly, get the community-supported responsive osCommerce (Phoenix).

here: on the official osc download page

Working on generalising bespoke solutions for Quickbooks integration, Easify integration and pay4later (DEKO) integration at 2.3.x

Share this post


Link to post
Share on other sites

Thank you, I never would have figured that out in a million years.

Gonna give it a shot, hey what could go wrong except everything...

I really appreciate you taking the time to explain all that.

6 minutes ago, BrockleyJohn said:

Yes, that's right. After doing that you will see in Sourcetree a lot of Unstaged files that show the differences between your files and Gary's. It's worth going through them to check that they are real differences and not just a bit of formatting - you can discard individual lines and groups of lines, to keep the amount of change to a minimum. This is worth doing because it will reduce the number of conflicts you get in the future. You can use the list as a work list and 'stage' each file when you've checked it.

NB if your github repository is public, it's best not to copy your configure and htaccess files into it. Just make sure that the ones in your site are read-only so you don't overwrite them by mistake sometime. If you have already copied them, discard the changes to these files instead of staging them.

When you've been all through them, check that Sourcetree is pointed at your branch (highlighted on the left as it is in your screenshot) and then do a Commit which saves the changes in your branch in your local repo and do a push which copies the branch to your github fork.

 

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now

×