I'd second the SourceTree recommendation. (They're also working on a version for Windows.)
Atlassian also has some good Git tutorial and training info available here: http://www.atlassian.com/git/ --Dasa On Mar 12, 2013, at 9:43 AM, Jose Barragan <jose.barra...@codeoscopic.com> wrote: > Hi Erik, > > I recommended you the Altassian SourceTree in mac. > > In order to your question, both Mike and you share the same branch, and > you'll commit and push over it like as SVN, in this scenario the previous > stage/commit provides you a bullet time for compose and freehand to compare, > advance or reverse in time before commit and push. > > Your working copy is always ready to use, even you need switch inter > branches, experiments, dry test, etc... > > You can use your own .gitignore until we get RW access, at this moment you > can remove from you stage, pretty clean all. > > -- > Jose Barragan > Software Architect Chief > Codeoscopic Madrid > C/. Infanta Mercedes, 92. > Planta 5. 505. > 28020 Madrid. > Tel.: +34 912 94 80 80 > > On Mar 12, 2013, at 1:05 PM, Erik de Bruin <e...@ixsoftware.nl> wrote: > >> Carlos, >> >> I don't get it. Mike and I work together, so we need to have the same >> codebase. When I have made a change that Mike needs to include in his >> source, in git I do a 'push', in SVN I do a 'commit'. To stay up to >> date with my code, Mike needs to do a 'pull' in git ('update' in SVN). >> What's different? >> >> EdB >> >> >> >> On Tue, Mar 12, 2013 at 1:00 PM, Carlos Rovira >> <carlos.rov...@codeoscopic.com> wrote: >>> HI Erik, >>> >>> as you already notice we must to setup the .gitignore file. >>> Until we get write status we can't get this file correctly configured. In >>> the meanwhile you can setup your own until we get write access and can >>> commit it. >>> >>> Now that we are at few hours to fully work on GIT, I'm sure you will love >>> it. For example, you could work with Mike much better making your own >>> branches and taking control over your commits and what you want to share in >>> the remote repository. The problems you both face the previous week where >>> one can step changes over the other are gone thanks to branching feature. >>> You only have to take patience to master this feature and you will see that >>> is very powerful and get lots of control. In SVN the main problem is that >>> all happens in one single place since branches are not usable and this >>> causes that kind problems while working with other people. >>> >>> Regarding the problem you commented about your changes not committed in >>> your workspace. Justin and others talked about it and share solutions. Just >>> to complement, I think you should clone the flex git repo, extract a patch >>> from SVN with your changes and apply it to your git clone. Then I recommend >>> to branch and commit your changes in that branch so you continue to work in >>> your local repo. When GIT remote repo will come writeable you could push >>> your branch to the remote repo. This will make you safe that you're not >>> breaking anything since your branch will be isolated. When that branch will >>> be shared remotely, Mike will be able to checkout and work in it, or fork >>> again to make whatever experimental change he like. Then you all can plan >>> the merge and when ready merge into develop. >>> >>> Best >>> >>> Carlos >>> >>> >>> 2013/3/12 Michael Schmalle <apa...@teotigraphix.com> >>> >>>> Yeah, >>>> >>>> Make sure you read the correct syntax when creating the files and entries. >>>> I haven't checked out anything from git yet, got some other things to do >>>> today. >>>> >>>> I have used GIT quite extensively Erik, once you get passed the "blah" of >>>> it, your golden. I can help you to with our project if you have questions. >>>> >>>> Tortoise GIT is just like Tortoise SVN! Use it. :) >>>> >>>> Mike >>>> >>>> >>>> Quoting Erik de Bruin <e...@ixsoftware.nl>: >>>> >>>> Ok, >>>>> >>>>> The git equivalent of 'svn:ignore' is apparently a file named >>>>> ".gitignore" you create in the directory where you want to hide files >>>>> [1]. I have created one for FalconJx in my local repository/working >>>>> copy/? and added the same entries as were in 'svn:ignore'. >>>>> >>>>> I guess this needs to be done for all (sub) projects that used >>>>> 'svn:ignore'... >>>>> >>>>> EdB >>>>> >>>>> 1: >>>>> http://gitready.com/beginner/**2009/01/19/ignoring-files.html<http://gitready.com/beginner/2009/01/19/ignoring-files.html> >>>>> >>>>> >>>>> >>>>> On Tue, Mar 12, 2013 at 11:20 AM, Erik de Bruin <e...@ixsoftware.nl> >>>>> wrote: >>>>> >>>>>> Hi, >>>>>> >>>>>> I'll keep asking 'noob' questions until I feel comfortable that I can >>>>>> work with git in a manner that won't harm the project. This is only >>>>>> the first one in what I'm sure will be a long series of questions. And >>>>>> before you get tired and shout: "use the internet!", what I'm trying >>>>>> to do is record these things in the mailing list in the hope someone >>>>>> picks them up and puts them in the Wiki. That way the hordes of >>>>>> contributors that this move is alleged to bring will have easy and >>>>>> consistent access to what I'm sure will be an extensive FAQ... >>>>>> >>>>>> Ok, rant over, this is my question: >>>>>> >>>>>> When I build the SDK (even a partial build) or FalconJx, my 'stage' >>>>>> (am I saying that correct?) ends up with a whole lot of files that I >>>>>> never saw in SVN. Do I 'ignore' these files? If so, does that affect >>>>>> the remote project/branch? Do I need to 'push' this local change, like >>>>>> I need to commit when I add a "svn:Ignore" property? >>>>>> >>>>>> EdB >>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Ix Multimedia Software >>>>>> >>>>>> Jan Luykenstraat 27 >>>>>> 3521 VB Utrecht >>>>>> >>>>>> T. 06-51952295 >>>>>> I. www.ixsoftware.nl >>>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Ix Multimedia Software >>>>> >>>>> Jan Luykenstraat 27 >>>>> 3521 VB Utrecht >>>>> >>>>> T. 06-51952295 >>>>> I. www.ixsoftware.nl >>>>> >>>>> >>>> -- >>>> Michael Schmalle - Teoti Graphix, LLC >>>> http://www.teotigraphix.com >>>> http://blog.teotigraphix.com >>>> >>>> >>> >>> >>> -- >>> Carlos Rovira >>> Director de Tecnología >>> M: +34 607 22 60 05 >>> F: +34 912 94 80 80 >>> http://www.codeoscopic.com >>> http://www.directwriter.es >>> http://www.avant2.es >> >> >> >> -- >> Ix Multimedia Software >> >> Jan Luykenstraat 27 >> 3521 VB Utrecht >> >> T. 06-51952295 >> I. www.ixsoftware.nl >
