?
Thanks,
-Fred
-Message d'origine-
From: Dasa Paddock
Sent: Tuesday, March 19, 2013 8:12 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Here's one way to avoid having git pull create a merge
,
-Fred
-Message d'origine- From: Dasa Paddock
Sent: Tuesday, March 19, 2013 8:12 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Here's one way to avoid having git pull create a merge
an example clearer than in
your link ?
Thanks,
-Fred
-Message d'origine-
From: Dasa Paddock
Sent: Wednesday, March 20, 2013 7:16 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
The problem
: Wednesday, March 20, 2013 7:16 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
The problem would be if you had first pushed clone 2 and then did the pull
--rebase in clone 1. For more info see:
http
:43 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Try:
Clone 1:
1- I checkout a new branch test1
2- I created a file test1.txt
3- I add/commit test1.txt
4- I checkout master
5- I merged --no-ff
Hi,
Very odd as I've made no changes to README - any idea what''s happen here?
Justin
On 19/03/2013, at 11:37 PM, jmcl...@apache.org wrote:
Updated Branches:
refs/heads/develop b5fce9368 - 4f6c47d2e
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into
-sourcecode.html
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, March 19, 2013 1:50 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
Very odd as I've made no changes to README - any idea what
branch.autosetuprebase always
[2] http://flex.apache.org/dev-sourcecode.html
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, March 19, 2013 1:50 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi
HI,
[1] git log --graph --oneline --all
Which produces nothing that's meaningful to IMO. ie README isn't mentioned.
* 4f6c47d Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
|\
| * b5fce93 FLEX-33435 added more details
| * 9c7c97e Updated for the
-Message d'origine-
From: Frédéric THOMAS
Sent: Tuesday, March 19, 2013 2:06 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
yeah, you shoud run this[1] once to allow automatic rebasing
Hi,
it's not the git default because in git we're soppose to work on branches for
features and more than one commit bug fixes,
All my bug fixes were a single commit. Are we really support to make a branch
for that then merge the branch and then commit for a changing in a single file?
AFAIK
Hi,
If you look at the history, you can see that your commits has been placed
before mines even though I pushed before and the first line is the merge
commit, the reason why it touched the README I committed.
I guess the question is is README in a correct state or not? And if it didn't
, March 19, 2013 2:59 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
it's not the git default because in git we're soppose to work on branches
for features and more than one commit bug fixes,
All
That's correspond to the 2 commits modifications I did on this file.
-Fred
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, March 19, 2013 3:05 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk
Hi,
Yes, look at [1] and see hotfixes.
Hotfixes apply to the release branch not the develop branch.
And you should have done a git pull -rebase instead, because they will forget
to do so, it is better to instruct git to automaticly rebase on pull (the
command I gave you in the previous
-
From: Justin Mclean
Sent: Tuesday, March 19, 2013 3:44 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
Yes, look at [1] and see hotfixes.
Hotfixes apply to the release branch
/tutorial/git-basics
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Tuesday, March 19, 2013 3:56 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hotfixes apply to the release
Hi,
NO, that's the opposite
Really?
https://wincent.com/wiki/git_rebase:_you're_doing_it_wrong
Dozen of stack overflow question on the issue which warn about rebasing. For
instance:
http://stackoverflow.com/questions/8939977/git-push-rejected-after-feature-branch-rebase
Rebase and a shared
: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
NO, that's the opposite
Really?
https://wincent.com/wiki/git_rebase:_you're_doing_it_wrong
Dozen of stack overflow question on the issue which warn about rebasing. For
instance:
http
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
The first link says exactly what I'm saying, you want to put your changes on
top of what everybody else has done.
'So git rebase is not wrong. But it's right only if it's YOUR VERY
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, March 19, 2013 4:20 PM
To: dev@flex.apache.org (mailto:dev@flex.apache.org)
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
NO, that's
(mailto:dev@flex.apache.org)
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
The first link says exactly what I'm saying, you want to put your changes
on
top of what everybody else has done.
'So git rebase is not wrong. But it's
: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
And now it's really time to explain this to - or rather: prescribe this for -
us mere mortals. I think a couple of simple use cases with the exact
steps/commands on the wiki (checkout, commit, push, pull
-Message d'origine-
From: Dasa Paddock
Sent: Tuesday, March 19, 2013 6:57 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
This is the best explanation of when to merge vs. rebase that I've
: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi,
This document is perfect, the maybe only little point it didn't cover in
Keeping the feature branch up to date is the possibility interactively
rebase your commit, which allows in case
/merge-or-rebase/
Added as comment to the wiki
-Fred
-Message d'origine- From: Frédéric THOMAS
Sent: Tuesday, March 19, 2013 7:23 PM
To: dev@flex.apache.org
Subject: Re: [3/3] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Hi
Hi,
I find it interesting that you apparently can't use Git well without
appending all sorts of obscure switches such as --ff-only, --preserve-merges,
and --rebase to your commands.
And everyone seems to have a slightly different opinion on which one to use :-)
If you don;t use the command
Hi,
What I'm hoping to see is more task-based and Flex/Apache/NVIE oriented
step-by-steps.
+100 to this.
Justin
I used a test git repo to experiment with different scenarios by first going
through this tutorial:
http://try.github.com
You could of course skip the tutorial and just create a test git repo directly
at github.com
--Dasa
On Mar 19, 2013, at 2:30 PM, Justin Mclean jus...@classsoftware.com
Hi,
I used a test git repo to experiment with different scenarios by first going
through this tutorial:
http://try.github.com
You could of course skip the tutorial and just create a test git repo
directly at github.com
I think most of us are aware and can use the basic git commands. I
I'll take a shot at these :)
On Mar 19, 2013, at 4:04 PM, Justin Mclean jus...@classsoftware.com wrote:
Hi,
I used a test git repo to experiment with different scenarios by first going
through this tutorial:
http://try.github.com
You could of course skip the tutorial and just create a
31 matches
Mail list logo
