I've done 'git pull', and received a merge conflict. I know that the other version of the file is good, and that mine is bad (all my changes should be abandoned). How do I do this?
unmerged: _widget.html.erb
You are in the middle of a conflicted merge.
I want a simple timeline component (like in video editing software) for a clojure/seesaw app and I am wondering if it is a good approach to implement this directly with clojure and seesaw or if I should write it in java and make my clojure wrapper around it.
Or more generally: is a functional programming language optimal for writing UI widgets? I cannot imagine doing that without a lot of state involved. And wasn't OO invented for UI-development in the first place?
Thus far worked with asp.net mvc1 and just started with asp.net mvc2..... what are good candidates for executing a controller asynchronously? Should i use it for long running process or some background processing? What are the pros and cons choosing asynchronous controller in asp.net mvc 2? Any suggestion...
First time I am bit disappointed in StackOverflow cause my http://stackoverflow.com/questions/2571727/c-concurrency-vs-java-concurrency-which-is-neatly-designed-which-is-better question was closed.
My intension was just trying to gather knowledge from programming guru's who worked in both the programming technologies. Rather closing this question, please help me by discussing what is good, bad, and ugly in multi-threading part in both the platforms.
It is also welcome, if someone would like to compare with .Net 4.0 with JDK 6 (or JDK 7)
kind of a silly question, but ive been seeing things such as tbody and thead/tfood tags in other peoples tables
are these required even if they're empty for good markup? or can i just leave them out?
thanks
Are there any good tools or tricks for determining if there are any referenced but unused dependencies (such as dlls) in a project?
My specific case is C# .net3.5.
Here is our dependency tree: BigApp - Child Apps - Libraries
ALL of our components are HEAVILY using one of the Libraries as above ( LibA).
But it has a ‘few’ public methods that require classes from ‘higher-level’ assemblies and we want to avoid CIRCULAR references.
What do you propose as a good design for this?
Hello!
I'd like to get the main image for an article, much like Facebook does when you post a link (but without the choosing image part). The data we have to work with is the whole pages HTML as a variable. The page & URL will be different for every time this function runs.
Are there any libraries or classes that are particularly good at getting the main body of content, much like Instapaper that would be of any help?
I have a thread in my application that is running code that can potentially cause call stack corruption ( my application is a testing tool for dlls ).
Assuming that I have a method of detecting if the child thread is misbehaving, how would I terminate it? From what I read, calling Thread.Abort() on the misbehaving thread would be equivalent to raising an exception inside it.I fear that that not be a good idea, provided the call stack of the thread might be corrupted.Any suggestions?
Hi, not necessarily a programmer question but I need to enter a TAB after every 84th character of a text. I'm trying to do it in InDesign but I don’t see an option for this. Is there a good application to do this?
Preferably Mac OS X compatlible but Windows XP is fine too.
Thank you very much!
Is it good for user experience to duplicate browser/keyboard functionality?
For example: to provide these links on a web-page.
"Back to top" link
"Print this page" link
"Add to Favorite" link
"Back" button/link
"Text zoom" button
Are they really create Site's usability and accessibility?
How screen reader will behave these links, will these confuse to screen reader users?
Is there any good framework for comparing whole objects?
now i do
assertEquals("[email protected]", obj.email);
assertEquals("5", obj.shop);
if bad email is returned i never get to know if it had the right shop, i would like to get a list of incorrect fields.
Where can I find good templates for svn commit emails?
Google led me to this. Even though it was much better than the default post-commit, I didn’t find it very useful.
Help much appreciated.
Hi,
Can anybody tell me a good example of Singleton pattern? Also I've one doubt to ask, Is the following scenario is that of singleton pattern:
When we have many printers connected in LAN but only one printer queue?
I need to allow users to upload files onto a server that has an antivirus program running with real-time scanning switched on.
What would be a good design to ensure that infected files are not uploaded to the server.
Questions -
would large files be copied onto disk and then immediately scanned, or would they be scanned as they are copied and not allowed to appear on disk if infected
Should i build a seperate infrastructure around this to specifically ionvoke a scan on the copied file ? this might be an issue if the file is deleted through the real-time scan
Adding a validator to my form:
jQuery.validator.addMethod('whatever', function(val, el) {
// whatever goes here
}, 'A maximum of ' + $('#my_id_here').val() + ' categories can be selected.');
This doesn't fly. I always get undefined. Is this a good, simple way to do this?
Thanks
I am a java beginner and so far have completed learning the core java concepts except io chapter. I also want to finish up the j2ee material and other stuffs like hibernate, springs and struts .
At present I have good knowledge of Java . please guide me that how can i finish up studying Hibernate, Springs and Struts in 2 days without going through J2ee in detail .Since I am preparing for the interview ?
thanks for the help..
I've been looking into some bug trackers and Retrospectiva seems like a good tool. However, I am having all sorts of trouble installing it on my machine. I followed the guide on their site (http://retrospectiva.org/tickets/357) but it hasn't helped much and there don't seem to be a lot of users on their site that work with Windows.
I am wondering if any of the SO users have any experience working with Retrospectiva.
Do you have experience with a Javascript templating engine, one that is stable, easy to use and has good performance?
I need to do apply the same template many times for different data. I prefer to download the template itself once (and have it cached) rather than processing the template on the server. Also, this way the template itself would be a static resource more easily cached in the server side too.
I tried using -resetStandardUserDefaults, I tried removing the plist file, none of those really do what I need. I want to reset my preferences completely, as if the app re-installed. Is there a good solution to this?
I tried :
NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
[[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
But Xcode complains. Apparently, it doesn't like that the plist file has disappeared.
I have only little knowledge about LaTeX, basic formatting, basic math fomulae etc.. I found that LaTeX is hard to configure to my own flavor. Recently, I've heard about Docbook, which is also a typesetting mechanism, but much easier since it uses XML. So, if my main job using LaTeX/Docbook is writing a simple document (not a class book) with some mathematics, and I want easy configuration, and a highly constomizable application, which one is better, and is there any good book on Docbook?
I want to make an article rotator similar to http://www.vmagazine.com/
And I want to use jQuery.
I know there are carousels like jCarousel and jQuery Carousel.
There is also the Coda-Slider, but I don't fint it very elegant.
Can anyone suggest a good jQuery method / script for having an article carousel?
I don't want to use MooTools, Prototype etc. since I'm already using jQuery.
Any suggestions anyone?