Perfection as a goal is a nice idea that can point one in a specific direction. However, since "perfection" is an ever changing (evolving?) and moving target, one must admit that perfection can never be obtained...
When in doubt, check the d4mn source code!
And here are my terms...
I don't care if you use my source code. (Known as "Code.")
I don't care if I get any monetary compensation.
I do care to receive credit for Code provided. So, please keep my name in the comments for Code provided.
Code is provided without warranty "AS-IS" and I claim absolutely no warranty nor liability to the quality, security, and run-ability on any platform.
By using Code, you accept all risk inherit with Code regardless if Code has known and yet to be discovered bugs.
You are welcome to change and improve the Code to best meet your needs.
I don't care if you use the Code in a commercial or open-source project.
You are not required to contact me prior to using the Code.
From what I can see in the commit, two new stores were added and one model's name was changed. Since this would modify both .architect & metadata/Application files, it be different from the teammates local copy. It looks like he choose to merge with the GitHub copy rather than use his local (more up-to-date) copy.
** Is there any way for SA to ask the developer if they really want to rebuild/replace the application node due to merge detection?
I don't normally see this type of behavior, but then my teammate is relatively new to Sencha.
While I would agree, I do prefer to be notified if the changes detected would make numerous changes to the Application node. Especially if a corrupt node is detected. I'm not suggesting that SA confirm on every file change from a repo pull. (Dreamweaver does this and it is annoying.)
Perhaps a compromise:
I know that many other non-interpreted languages have well established "best practices" when it comes to CVS/SVN/Git/etc... Perhaps what we should have (if not already documented) is a section on using Git, BitBucket, etc on how to handle merges from the repository.