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 ?

Thanks,
-Fred

-----Message d'origine----- From: Justin Mclean
Sent: Thursday, March 21, 2013 8:06 AM
To: dev@flex.apache.org
Subject: Re: [OT] Log history

Hi,

Part of the issue here is that you almost always going to have unstaged changes in the SDK eg rat report, mustella test results, player swc or AIR SDK files etc etc. In that case a git pull -rebase will always fail with "Cannot pull with rebase: You have unstaged changes." .And you don't want to commit these things into the SDK and I think in this case git stash will remove the changes you actually want to commit?

Justin

Reply via email to