Basic Branching and Merging Let’s go through a simple example of branching and merging with a workflow that you might use in the real world. You’ll follow these steps: Do work on a web site.Create a branch for a new story you’re working on.Do some work in that branch. At this stage, you’ll receive a call that another issue is critical and you need a hotfix. You’ll do the following: Switch to your production branch.Create a branch to add the hotfix.After it’s tested, merge the hotfix branch, and push to production.Switch back to your original story and continue working. Basic Branching First, let’s say you’re working on your project and have a couple of commits already. You’ve decided that you’re going to work on issue #53 in whatever issue-tracking system your company uses. $ git checkout -b iss53 Switched to a new branch "iss53" This is shorthand for: $ git branch iss53 $ git checkout iss53 You work on your web site and do some commits. $ vim index.html $ git commit -a -m 'added a new footer [issue 53]' Basic Merging Note
How to: Develop in Corona SDK on Windows | Producerism 9/3/2011 Update: Added some changes to the process, updated screenshots, and disclaimers regarding Java JDK v6 and the new Corona requirement of Android OS 2.2+ and ARMV7. I've expanded on the hardware shortcoming and a few other annoyances and issues in a new post: Where Corona SDK Falls Flat. Developing mobile apps and games for both Android and iOS (iPhone/iPad/iTouch) is not the easiest thing in the world. For iOS, the main option is to develop in Objective-C with Xcode in OSX. However, if you want to develop for Android, there are a few more options - although most of them still require recoding when porting to iOS. One of the biggest options for cross-device development is the Adobe iOS Packager for Flash/Flex/AIR. Corona SDK is basically a Lua library that wraps both Android and iOS functions into a single API. Requirements Before we start, you will need to download these four things (don't worry, they are all free). Installation This is all pretty easy. Almost done. That's it!
Understanding Design Patterns in JavaScript Today, we're going to put on our computer science hats as we learn about some common design patterns. Design patterns offer developers ways to solve technical problems in a reusable and elegant way. Interested in becoming a better JavaScript developer? Then read on. Republished Tutorial Every few weeks, we revisit some of our reader's favorite posts from throughout the history of the site. Solid design patterns are the basic building block for maintainable software applications. A design pattern is a reusable software solution Simply put, a design pattern is a reusable software solution to a specific type of problem that occurs frequently when developing software. patterns are proven solutions to software development problems patterns are scalable as they usually are structured and have rules that you should follow patterns are reusable for similar problems We'll get into some examples of design patterns further in to the tutorial. Take a look at the three examples above.
Best Java IDE to do more high-quality code in less time Java 8 & Java EE 7 Support Straightforward User Interface Editor New Features New Tools for Android Developers Refined Gradle Integration New Tools for Database Access IntelliJ IDEA 13.1, the Java IDE with the fastest-growing mindshare, includes support for Java 8 and Java EE 7, new tools for Android development, the editor enhancements, and refined Gradle integration. IntelliJ IDEA 13 adopts Java 8 and Java EE 7, the latest versions of Oracle's Java language and enterprise platform, along with support for new versions of enterprise application servers. The new editor comes with Sublime Text style multiple selections and also introduces Postfix code completion, a new kind of completion for Java which extends your productivity even more. IntelliJ IDEA 13.1, the Java IDE with the fastest-growing mindshare, includes enhanced support for Java EE 7, better Spring support, new tools for Android development and refined Gradle integration.
OK Computer Solutions Top 10 Tools, Tips, and Tricks for Corona SDK | Producerism This post will cover some extremely useful third party tools (both free and paid) for Corona developers (specifically on Windows). Since starting with Corona SDK in 2011, I have really taken a liking to it. It hasn't replaced my other solutions yet , and I'm not sure that it ever will.. but truth is, it doesn't have to replace anything. Corona seems to be in a good niche all to it's self, despite the pugilistic attitude towards Adobe's Flash/AIR/etc. Various software that can save time and really help out specifically with Corona development. 1. (texturepacker.com - free version available, Pro: $24.95) TexturePacker is essential for creating spritesheets in Corona (it also exports to Unity3D, css, json, cocos2d and others). Final Thoughts: If you need to create lots of spritesheets, the $25 spent on this program will repay itself after the first hour or two you save yourself in time and frustration. 2. (physicseditor.de - Paid: $19.95) 3. (jetbrains.com/idea - Free) 4. 5. 6. 7. 8. 9. 10.
MonoDevelop - MonoDevelop 3rd Party Tools and Services These tools have been developed by 3rd party developers and are part of the growing Corona SDK ecosystem. They extend Corona and/or help with your overall development. Are you interested in having your tool listed or featured? Featured Tools Texture Packer TexturePacker comes with a full featured graphical user interface including multi-touch support, zooming and a tree view with all used sprites. Lua Glider IDE Lua Glider IDE is an advanced IDE for Corona® SDK professionals and beginners alike. 700 Sprites Philipp Lenssen, a Corona developer (and winner of App of the Month!) bmGlyph bmGlyph is a bitmap font generator for OSX. Corona Textmate Bundle Corona TextMate bundle is designed to help TextMate users code their Corona® SDK apps more quickly. Outlaw IDE Outlaw IDE is for anyone who develops mobile apps using Corona® SDK. Corona Remote Corona® Remote is an application & Lua library designed to send remote accelerometer data to Corona® SDK. Explosion Generator 3 Game Coder Glyph Designer Kutt