I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my local changes and ignore the remote changes causing conflicts. Is there a command I can use to in effect say "mark all conflicts as resolved, use local"? ...

I'm writing a Rails application, but can't seem to find how to do relative time, i.e. if given a certain Time class, it can calculate "30 seconds ago" or "2 days ago" or if it's longer than a month "9/1/2008", etc. ...

I have a problem where i'm initialising a variable on the scope in a controller. Then it gets changed in another controller when a user logs in. This variable is used to control things such as the navigation bar and restricts access to parts of the site depending on the type of user, so its importan...

Given Iterator<Element> , how can we convert that Iterator to ArrayList<Element> (or List<Element> ) in the best and fastest way possible, so that we can use ArrayList 's operations on it such as get(index) , add(element) , etc. ...

I saw some people use a statement to query a table in a MySQL database like the following: 10 Answers ...

What exactly is RESTful programming? 35 Answers 35 ...

Let's suppose you have a page with a relatively strict doctype and HTML markup that's pretty close to compliant, but perhaps misses in a few silly ways, perhaps because of user content that's out of your control... say you're working on a content management system or a theme for a content management...

I am trying to figure out if I should migrate my gwt-rpc calls to the new GWT2.1 RequestFactory cals. 8 Answers ...

How to simulate a touch event with Android while giving the X and Y coordinates manually? 7 Answers ...

I recently came across Phonegap . Have anyone of you tried it. Its an incredible tool which claims that developers can use HTML 5 based framework like Sencha touch and Jquery at the same time having access to native features on phone. Also the code is portable from Android to Iphone with some effo...