Erik,
I'm no git guru but, the great thing about git is its "cheap branches".
You will be pushing your changes but, you will be pushing a "branch"
that is not the master.
Once you have pushed that experimental branch, I can switch to that
branch which changes my local files to mirror yours, then I can see if
there are confilcits.
I can merge my commits into your branch. Once that branch is on a
working level, we can then merge your branch into master.
I know this is confusing and I will admit I have not worked on a large
project like this in git but, I do kind of understand why the git
branching is superior to svn.
Don't worry about mishaps, I will make them to, we will figure it out.
Calros, if I made a mistake in this description, please amend my
statements with facts. :)
Mike
Quoting Erik de Bruin <e...@ixsoftware.nl>:
What advantage is having a local repo to having a local working copy?
It seems to me that all it does is add an extra layer between me and
my co-contributors. I need to 'commit' to my local repo and then
'push' to get it out to the world, where before only a 'commit' was
needed...
EdB
On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira
<carlos.rov...@codeoscopic.com> wrote:
commit is like SVN, you are making a commit in your *local* repo.
When GIT will became RW, you will be able to "push" to the remote repo
sharing your changes.
In Git you have a fully functional local repo, and there's a shared one
remotely while in SVN there's only one remotely...
2013/3/12 Erik de Bruin <e...@ixsoftware.nl>
Joao,
Thank you... but that went right over my head. I'm still at the stage
where I'm trying to grok the difference between 'commit' and 'push'...
I'll get there, but I'm so not pleased with (the timing) of this move
that you all get to enjoy my wining about it until I have the FalconJx
stuff - which I had nicely lined up for a SVN commit - working again
in the new git repos I've been forced to make, and my code is safely
'staged/committed/pushed' for all to enjoy.
EdB
On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes
<joaopedromartinsfernan...@gmail.com> wrote:
> Eric, If you want to learn the basics behind git you can try
> http://pcottle.github.com/learnGitBranching/ , it helped me.
>
>
> On 12 March 2013 09:14, Erik de Bruin <e...@ixsoftware.nl> wrote:
>
>> Are you sure?
>>
>> I did a 'git clone' and 'build.properties' shows:
>>
>> # flex-sdk-description values
>> release = Apache Flex 4.9.1
>> release.version = 4.9.1
>>
>> While the develop branch in SVN has:
>>
>> # flex-sdk-description values
>> release = Apache Flex 4.10.0
>> release.version = 4.10.0
>>
>> Oops?
>>
>> EdB
>>
>>
>> On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS
>> <webdoubl...@hotmail.com> wrote:
>> > it contains a copy of the develop branch you should do: git clone
>> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git, it will create
a
>> new
>> > directory called flex-sdk, if you prefer 'develop' append ' develop'
to
>> the
>> > clone command
>> >
>> > -Fred
>> >
>> > -----Message d'origine----- From: Erik de Bruin
>> > Sent: Tuesday, March 12, 2013 9:40 AM
>> >
>> > To: dev@flex.apache.org
>> > Subject: Re: SVN to Git migration in progress
>> >
>> > Just trying to understand what just happened:
>> >
>> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
>> >
>> > Does that contain a copy of 'trunk' or of 'branches/develop'?
>> >
>> > EdB
>> >
>> >
>> >
>> > On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS
>> > <webdoubl...@hotmail.com> wrote:
>> >>
>> >> I'm currently cloning the repo to see how it has been done...
>> >>
>> >> -Fred
>> >>
>> >> -----Message d'origine----- From: Justin Mclean
>> >> Sent: Tuesday, March 12, 2013 9:11 AM
>> >>
>> >> To: dev@flex.apache.org
>> >> Subject: Re: SVN to Git migration in progress
>> >>
>> >> Hi,
>> >>
>> >>> Hey, textLayout is converted to git too, so a git submodule init and
>> then
>> >>> git submodule update should do the trick, non ?
>> >>
>> >>
>> >> No because we need a subdirectory of the textLayout git repo.
>> >>
>> >> Justin
>> >
>> >
>> >
>> >
>> > --
>> > 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
>>
>
>
>
> --
>
> João Fernandes
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
--
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
--
Michael Schmalle - Teoti Graphix, LLC
http://www.teotigraphix.com
http://blog.teotigraphix.com
