I would guess development. Master is the currently release version I believe. Development is where the day-to-day coding happens. When we release a new version we make that the new master. At least that’s how I think it works if I read the document correct that Luis sent out about the Git branching strategy we adopted
That’s really helpful. I’ll clone from development then, work up the changes and submit a patch to you guys.
You got it!!
Luis F. Majano
Ortus Solutions, Corp
ColdBox Platform: http://www.coldbox.org
Linked In: http://www.linkedin.com/pub/3/731/483
IECFUG Manager: http://www.iecfug.com
I have the first working iteration of this now running, passing unit tests etc.
What’s the best way to share it with you?
Github pull request or via review here or your repo
Ortus Solutions, Corp
GitHub pull request seems like a fair approach.
I’m new to both Git and GitHub so may need a little help.
I cloned from the GitHub repo, from the ‘development’ branch, have made my changes.
How do I go about getting to the pull stage. Sorry for being a pain, I just don’t want to break anything
I understand you’re pain. GitHub really confused me for a bit (and sometimes still does
What Git client are you using on your machine? I’m using SmartGit, and what I do is FIRST branch a local branch for the changes I’m making. I do this because Git will only allow one pull request at a time for a given branch. That means, if I think of something else I want to play with and submit separately, I can do it in a different branch with a different pull request.
In SmartGit, I stage the files that have changed (with the “stage” button) and then commit them locally. After that “push” them to your “origin” remote which should be your fork on GitHub which you will have write access to. There’s no way you can screw up Luis’s main repo since you don’t ever make any changes to it. So, push all local branches to your remote and then your code should show up on your GitHub website.
After that, you switch to your new feature branch on the website, and click pull request.
And as a note, you’ll probably also want to configure another remote in SmartGit called “upstream” which points to the main ColdBox repo. You can merge from there back into your own local repo when you want to update from the latest. At least that’s what I do. anyway
Thanks for the reply mate! I really like the ideas behind GIT, it’s just substantially more complex (and powerful) than SVN so still getting used to things.
Everything you said their makes perfect sense!
However, unfortunately, I didn’t Fork my own, or branch before making my code changes. doh!
Is there anyway I can move the code changes I’ve made over onto my own Fork & Branch? Or is it too late to do that automatically? Is it going to be a manual task? No biggy if it is, only a handful of files have changed.
Are you using Eclipse or CFBuilder?
If so you could always do this…. RMB (Right Mouse Button) and select restore from local history…
Hmm, I’ll admit I don’t know enough about Git to answer that. You can commit what you have now, but unfortunately you won’t be able to push it anywhere. Hopefully someone on the list can speak up, but the best replies I’ve usually gotten here usually go something like “learn the command line Git”
This is what I would do If I were you given my limited knowledge of Git:
- Back up the working directory of what you currently have checked somewhere else on your hard drive and strip out all the hidden directories.
- Go to the github site and create your fork.
- Clone your fork.
- Branch your clone and check it out
- Use a merge program like Araxis to move your changes back in.
Alternatively, if you only affected a few files, you might be able to just back those up instead of the entire thing.
I have one more idea, but I have zero clue if it will work. Create your fork on gitHub.com, and then create a “remote” that points to it and see if you can push directly to your remote. Then clone your remote fork into a separate local repo and revert your changes in your local coldbox repo.
That would just throw away his changes. He wants to be able to move his code changes into a clone of his fork, and not the clone of Luis’ main repo.
I was reading into it that he may have lost his changes, this was a way to get them back.
I took Brad's approach and it appeared to work quite nicely!