We use CVS currently and develop new features on a branch before merging to trunk. Occasionally we get merge conflicts caused by the CVS keyword substitution. So when reviewing the conflict file we see something like this <<<<<<< collect_logs.conf # CVS $Id: collect_logs.conf,v 1.6 2010/02/03 16:43:11 peterw Exp $ ======= # CVS $Id: col...
I have a remote that is the same, or similar, to the rails project in my current directory. To sync the two, I do git init git remote add origin blah@blah git pull The problem is that some of the files I had in my working copy were added (ie not in the remote), so when I do git status it should show a bunch of untracked files. Ins...
I am trying to use FtpWebRequest.Proxy and have it set to GlobalProxySelection.GetEmptyWebProxy() however i get a compliler warning Warning 1 'System.Net.GlobalProxySelection' is obsolete: '"This class has been deprecated. Please use WebRequest.DefaultWebProxy instead to access and set the global default proxy. Use 'null' inste...
I have a ASP.NET MVC 2 webpage in which I render multiple PartialViews of the same type. Each partial view contains a Ajax-form for posting smth. The form consists of: an input: EditorFor(m => m.content) the validation for the input: ValidationMessageFor(m => m.Content) The problem is that because there are more than 1 of these forms...
I have two Eclipse working sets (WorkingSet 0.1.x and WorkingSet 0.2.x). I need to do work on them interchangeably, though neither interacts with the other. The problem is that some of the projects obviously have the same name (MyProject, MyModule). Even if I close all of the projects in WorkingSet 0.1.x, I can't even add the 0.2.x versi...
WHY is it that i cannot use Scriptaculous and jQuery in the same page without calling: jQuery.noConflict() ? ...
I get this error in realtion to my [username].mode1v3 package file: Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed (details follow): I can do a compare from the SCM results menu on this file. Doing so reveals 102 conflicts (differences) between my local copy and the l...
I am revamping a website that now uses jQuery. The process is more than half way done but for the time being I need to setup a demo as soon as possible. For this I will copy existing ASP code as-is and these particular pages require prototype plugins. Converting all prototype plugins to jQuery is in the todo list. So I am wodering if the...
I have two routes mapped in my MVC application: public class MvcApplication : System.Web.HttpApplication { public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); routes.MapRoute( "Project", "{controller}/{projectid}/{action}/{id}", new { ...
On my page http://all-fours.pl/ I'm using moo.fx for.. something, I don't really know what. And now I was trying to add a jquery banner rotator. But still regarding fact that I'm setting my banner script in jQuery.noConflict(), the moo.fx library gives errors : function to set the jquery cycle plugin: <script type="text/javascript"> jQ...
We are rendering our content inside a HTML 'wrapper' which is supplied by the client. That HTML wrapper contains a reference to jQuery 1.2.6 so that's what I've been using for my jQuery functionality up until now. The problem I'm facing is that I'm dynamically rendering content that needs a click event associated with it. The click eve...
Hello, I am trying to update my changes to some python work onto an SVN server. When I attempt to commit the file to the svn, I get an error that my folder is out of date: "Transmitting file data .............svn: Commit failed (details follow): svn: Directory '/scripts/setup/configure' is out of date" When I attempt to run "svn updat...
Hello, I have a "core" application that is adapter to process task. Each task is implemented in an adapter load by the core to process the task. My question is, is it possible to have different classpath in each adapter to precent class/jar conflict between adapters. Regards, ...
I'm working on something similar to a pastebin (yeah, it's that generic) but allowing for multiple user editing. The obvious problem is that of multiple users attempting to edit the same file. I'm thinking along the lines of locking down the file when one user is working on it (it's not the best solution, but I don't need anything too co...
I am currently working on a web application where I have encountered a little problem. In this system, multiple users can log onto the same page and update the data (a series of checkboxes, dropdowns, and text fields). The issue is that data might get overwritten if one user was already on a page where old data was loaded, and has since...
I've been having the most AWFUL time integrating MailChimp into a site I'm designing! The problem is that validation is not working for the embedded subscribe form. Instead of inlining error messages, the form is kicking the user over to the MailChimp signup page to correct errors or confirm list opt in. I've done a heavy amount of cu...
Basically when i want to commit two separate changes in the same file that resulted from an git add --patch <file> operation, git svn rebase later on throws 1-2 conflicts upon comitting the second change when using git add for the second change. so i'm basically doing this (i'm on master branch and have fetched the svn repository): git...
I just implemented a multi-language mod onto my website. Problem is that there seems to be a conflict between the javascript files from the language mod and the javascript files that already were on the page. <!-- language files here --> <script type="text/javascript" src="js/jquery-1.4.2.min.js"></script> <script type="text/javascript...
Hey all, I find a lot of svn commands out there to delete directories and files. Unfortunately, every time I run these commands, I get strange errors afterwards like 'not under version control' or 'conflict'. I'm just looking for a straightforward svn command that will allow me to delete all the directories under the MARKT directory bel...
Hey all, I find a lot of svn commands out there to delete directories and files. Unfortunately, every time I run these commands, I get strange errors afterwards like 'not under version control' or 'conflict'. I'm just looking for a straightforward svn command that will allow me to delete all the directories under the MARKT directory bel...