Hi,
I want to RELEASE_NOTE and README (from the develop and release branches) into
the develop branch.
But it's more about getting the process documented so we can actually make a
release at some point. We want to make it as simple as possible for anyone who
wants to put up there hand as a rel
Ok, tell me what files you want to merge, I'll do that tomorrow when I wake
up, it's too now here 4:10.
-Fred
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, April 16, 2013 4:02 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES
H
and I just noticed as well, to check the diff on RELEASE_NOTES, use: git
diff origin/release4.9 RELEASE_NOTES
-Message d'origine-
From: Frédéric THOMAS
Sent: Tuesday, April 16, 2013 3:31 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES
Re wrote
HI,
> if you have files with conflicts you want to merge, you will have to go by an
> intermediary branch
This is almost always going to be the case with a release as it take time to
vote on and create serval release candidates while develop work continues on in
develop.
> apparently the RELE
then continue the rebase.
-Fred
-Message d'origine-
From: Frédéric THOMAS
Sent: Tuesday, April 16, 2013 3:23 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES
If we want to merge the entire tree would we follow the same process? (eg
like what we have
;origine-
From: Justin Mclean
Sent: Tuesday, April 16, 2013 2:39 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES
Hi,
ok, so, you need to go by an intermediary branch as git merge or rebase
only commits
It there a simpler way of doing this? In svn it just a &quo
Hi,
> ok, so, you need to go by an intermediary branch as git merge or rebase only
> commits
It there a simpler way of doing this? In svn it just a "svn merge" followed by
a "svn ci" - assuming you're happy with the merge.
If we want to merge the entire tree would we follow the same process? (
evelop
git rebase temp
git mergeTool RELEASE_NOTES
git rebase --continue
git mergeTool
git rebase --continue
git mergeTool
git rebase --continue
git branch -d temp
git push
-Message d'origine-
From: Justin Mclean
Sent: Tuesday, April 16, 2013 12:20 AM
To: dev@flex.apache.org
Subject: R
HI,
> git checkout origin/release4.9 RELEASE_NOTES
That just replaces the current RELEASE_NOTES file with the 4.9 one. What do you
need to do to merge the changes on both files together?
Thanks,
Justin
From your clean develop branch:
git checkout origin/release4.9 RELEASE_NOTES
git commit -m "Merge RELEASE_NOTES, etc.. from release4.9 branch"
git push
-Message d'origine-
From: Justin Mclean
Sent: Monday, April 15, 2013 10:26 AM
To: dev@flex.apache.org
Subject: Git
Hi,
Can someone go through the git steps required to merge the READ and
RELEASE_NOTES files in the 4.9.1 branch into the current develop branch.
Thanks,
Justin
11 matches
Mail list logo
