Ok, from what Erik said on a previous post and because he is on OSX, it
appears there's one more extension to add to the .gitignore.
I you do a release, I guess other files will be candidate to an addition
into this file too, I guess you can manage that, simply add those
files/folders to the "Apache Flex Project" section of the .gitignore file,
if you use sourceTree, look at the untracked files, if you use the command
line, use git status to see them.
Once done, you'll be able to do a "git pull --rebase".
Note: if you didn't add/modify files, you can safely do a normal "git pull",
no risks here.
Thanks,
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Thursday, March 21, 2013 8:20 AM
To: dev@flex.apache.org
Subject: Re: [OT] Log history
Hi,
Well, I completed my .gitignore right after a sdk build + other locales, I
put the generated files/folders to be exclude from git operations in the
.gitignore to avoid this kind situation, do you mean it still happens ?
Yep it still happens. Unless there something more I need to do with
.gitignore? It's checked in right?
Git pull --rebase gives:
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
Did you do a release build or run any mustella tests?
Justin
