Hi,
> after 450 emails in March + 3 Wiki pages written to make the people
> understand and have a good workflow using Git and reading noone cars or wants
> to learn
I for one appreciated the effort and I have learnt a lot form it. It is a lot
to take on and it's seemed to become very complex ve
t; Well, I already did my boxes closing the resolved JIRA, unassigned the others
> and committed my remote branch.
>
> I wish you a lot of pleasure.
>
> -Fred
>
> -Message d'origine- From: Nicholas Kwiatkowski
> Sent: Friday, April 05, 2013 2:11 PM
> To: dev
> -Message d'origine----- From: Nicholas Kwiatkowski
> Sent: Friday, April 05, 2013 2:11 PM
>
> To: dev@flex.apache.org
> Subject: Re: Still confused by git
>
> +1 on this. I've been sitting on the sidelines the last few weeks for that
> reason. I know there
> -Message d'origine- From: Nicholas Kwiatkowski
> Sent: Friday, April 05, 2013 2:11 PM
> To: dev@flex.apache.org
> Subject: Re: Still confused by git
>
> +1 on this. I've been sitting on the sidelines the last few weeks for that
> reason. I know there are a lot of sta
AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
+1 on this. I've been sitting on the sidelines the last few weeks for that
reason. I know there are a lot of standards that still need to be figured
out, and since I'm very green with GIT, I don't really have the time at th
lved JIRA, unassigned the
others and committed my remote branch.
I wish you a lot of pleasure.
-Fred
-Message d'origine-
From: Nicholas Kwiatkowski
Sent: Friday, April 05, 2013 2:11 PM
To: dev@flex.apache.org
Subject: Re: Still confused by git
+1 on this. I've been sitting on t
+1 on this. I've been sitting on the sidelines the last few weeks for that
reason. I know there are a lot of standards that still need to be figured
out, and since I'm very green with GIT, I don't really have the time at the
moment to learn all the command line (i've been really busy with persona
> - rebase your work on what the others did: git pull --rebase
> - Merge your branch to the develop one: git merge --no-ff FLEX-
> - you can now push: git push
> - you can remove your local branch if you want now it is unused: git br -d
> FLEX-
>
>
> I hope
to the develop one: git merge --no-ff FLEX-
> - you can now push: git push
> - you can remove your local branch if you want now it is unused: git br -d
> FLEX-
>
>
> I hope that helps
>
> -Fred
>
> -Message d'origine- From: Harbs
> Sent: F
27;origine-
From: Harbs
Sent: Friday, April 05, 2013 12:02 PM
To: dev@flex.apache.org
Subject: Re: Still confused by git
Thanks. I'll have to figure out how to translate that into the GUI of
SourceTree. I'm not sure if I have the time today to play around with this.
I'll pro
q=net+installer
-Mark
-Original Message-
From: Justin Mclean [mailto:jus...@classsoftware.com]
Sent: Friday, April 05, 2013 5:45 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
Hi,
> There's also been a lot of discussion on when to rebase and when not. I'
ur working tree, save them first: git
> stash -u "my current work"
> -Checkout the develop branch: git co develop
>
> -Fred
>
> -Message d'origine- From: Frédéric THOMAS
> Sent: Friday, April 05, 2013 11:31 AM
> To: dev@flex.apache.org
> Subject: R
I mean git status, but if you want to follow the commands I wrote, update
your .gitconfig as described in the wiki
-Fred
-Message d'origine-
From: Harbs
Sent: Friday, April 05, 2013 11:59 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
git: 'st' is no
not yet
>> touched any of the git folders on my machine
>
> I just noticed you wrote that, can you show me the result of 'git st' ?
>
> -Fred
>
> -Message d'origine- From: Frédéric THOMAS
> Sent: Friday, April 05, 2013 11:33 AM
> To: dev@flex.a
Hi,
> There's also been a lot of discussion on when to rebase and when not. I'm not
> clear on whether there has been a consensus on that.
I don't believe there is a consensus but that's mostly around how important it
is to keep a "clean" history and with respect to Frederic obvious knowledge i
013 11:33 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
oops, reverse the 2 furst steps:
-If you have some modified files in your working tree, save them first: git
stash -u "my current work"
-Checkout the develop branch: git co develop
-Fred
-Message d'origi
1:31 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
You right Harbs, that currently looks something I dislike at the point I
won't work anymore on that tree.
Well, for your case (I assume you updated your .gitconfig as shown in the
Wiki) :
-If you have some modified files in your wor
f you want now it is unused: git br -d
FLEX-
I hope that helps
-Fred
-Message d'origine-
From: Harbs
Sent: Friday, April 05, 2013 11:06 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
Hi Fred,
I've read those pages. (I see now you've updated them
/FLEX/Git+for+Apache+Flex+Guide
> [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage
>
>
>
> -Message d'origine----- From: Harbs
> Sent: Friday, April 05, 2013 10:14 AM
> To: dev@flex.apache.org
> Subject: Still confused by git
>
>
Btw, I just updated
https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide
with few more aliases.
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Friday, April 05, 2013 10:29 AM
To: dev@flex.apache.org
Subject: Re: Still confused by git
Hi Harbs,
day, April 05, 2013 10:14 AM
To: dev@flex.apache.org
Subject: Still confused by git
I've tried to follow all the git discussions. But, after all the discussions
on how to use git, I'm still confused on the basics.
Here's what I need to know right now:
Right now I have a number of
I've tried to follow all the git discussions. But, after all the discussions on
how to use git, I'm still confused on the basics.
Here's what I need to know right now:
Right now I have a number of files I've edited outside my working directory
related to ColorPicker inside experimental. I'd like
22 matches
Mail list logo
