conflict

Weird Chrome prototype/jQuery conflict

We have an application with legacy code that relies on prototype, but we've found it to be too 'heavy' for most of the places we want to use it and and have found jQuery to be a better fit for how we work. So we're migrating to jQuery for new functionality. In the meantime we have several pages that need to load both libraries: <script...

same function in different jar

Hi, I have a question and wonder if there is anyone came across the same situation as I did. I upgrade java version from 1.4 to 1.6, the java6 includes soap package itself, which means the axis soap libs i used previously will not be invoked. for example, javax.xml.soap.SOAPMessage. Is there anyway that I can explicitly force the a...

C# dll version conflict

I have a project like this: Test Solution Project TestApplication References: TestFunctions.dll(ver 1.0.0.0),Project TestDLL Project TestDLL References: TestFunctions.dll(ver 1.0.0.1) In the application when i make a call to TestDLL.Methodx() inside it calls TestFunctions.HelloWorld() but it gives a MissingMethodException because T...

Getting jQuery to work with Netscape 7 and 8

Netscape fails to read a lot of jQuery written. What steps do you take to overcome these, and how much of the market do netscape users take up? ...

Handling conflicts in SVN with Tortoise?

Any time an issue comes up like a merge conflict or something similar, it really slows me down. Can someone explain to me how to force-resolve conflicts? For example, a buddy of mine made an edit to a file on the repository and committed. While he was doing that, I had already renamed that file and made many edits to it on my working ...

Subversion resolve all conflicts quickly

When I have several conflicts, is there a way to resolve them all by just telling SVN to keep the version that is in the repository? Unfortunately, we're still using 1.4. ...

How to make HTML written by users on a site, not conflict with the site's stylesheets?

I have a website that allows a user to create blog posts. There are some backlisted tags but most standard HTML tags are acceptable. However, I'm having issues with how the pages get displayed. I keep the HTML wrapped in its own div. I would ultimately like to keep the HTML from the user separate from the main sites stylesheets so it...

Avoiding Language Keyword Conflicts

How do you guys avoid keyword conflicts in your language? For example, I'm creating a class (VB 2008) to hold all the configuration variables for some reports we generate. Naturally, one of the variables is "Date". And of course you can't have anything named the same as a keyword. In VB 2008 you do have the option of surrounding a confl...

JQuery conflict with an other JQuery library

Hi, I use jquery for a module. My joomla template have an integrated jquery menu. So they conflict with each other. Is there a way to solve this problem. Following the script code of the module <script type="text/javascript" charset="utf-8"> window.onload = function () { var container = jQuery('div.sliderGallery'); ...

Conflict between mootools and another (non-framework) script

I'm trying to integrate a javascript called ImageFlow into a Joomla site, but I'm getting an error in Internet Explorer (v8 native and compatibility mode) and it won't display. It works fine in Firefox and other browsers). I believe the error is related to mootools. Error details: Message: Object doesn't support this property or met...

Conflicting startDrags

Flash CS4, AS2 I'm making a tour with a map. I'm using this startDrag code to move the map around: menu.onPress = function() { this.startDrag(); }; menu.onRelease = function() { stopDrag(); }; This works perfectly. However, inside the "menu" movieclip I am using a hover tag startDrag code: EllisIsland._visible=false;{} Ell...

How a conflict is resolved in dynamic linking

XYZ.dll defines a global variable int x. ABC.c also defines the same global variable int x. How can one link XYZ.dll to ABC.exe? How is this conflict in global namespace resolved? ...

SVN Merge conflict during commit

Eclipse + Subversive plugin On commiting a directory which is out of sync with the SVN a message pops up: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory '.' is out of date; try updating svn: resource out of date; try updating Tried to update the whole project from Eclipse Navigator view (righ...

How can I author changes that are not prone to merge conflicts?

Automated merging isn't perfect. Just because there isn't a line-edit conflict doesn't mean there isn't a syntactic conflict, and that doesn't mean there isn't a semantic conflict. Does anyone have strategies for authoring low-conflict changes? Is this something that falls out of TDD or other approaches (Certainly TDD will help catch th...

SwfAddress conflict with SwfObject's 'callback' argument

Hi all, For a current project we are using SwfObject 2.2 to embed flash files, and the CRD gurus are using SwfAddress 2.3 to create SEO flash goodness. Turns out that if you have both libraries included on a page, then any attempts at using SwfObject callback in the API (http://code.google.com/p/swfobject/wiki/api) prevents the SwfObje...

How to use SVN to make our code in sync?

I am use tortoiseSVN to synchronize our code. But recent I found that there is something that is not so convenient. When i modify a file, let's say a.jsp, and my colleague might also modify this file, a.jsp, and this may result in conflict, and any one of use need to checkin the his code first, and the other one will need to update ...

can anybody help me how to deal this 2 javascript conflict

The First Script that allows me to create a moving clouds and loop after if reaches the end // dvdp - volll - iphone alert var agent=navigator.userAgent.toLowerCase(); var is_iphone = (agent.indexOf('iphone')!=-1); // TJP - volll var stispace=new Array(); var jumpspace=new Array(); var skyspace=new Array; skyspace['dir']=-1; skys...

Unexpected subversion conflict behavior (Conflict with no conflicts)

I've been getting frustrated with some subversion conflicts i've been getting for a long time now. I'm talking about when I do an update on a file and it says there are conflicts, so I open the file and there's no <<<< >>>> stuff in there. In tortoisesvn or visualsvn I go "Edit Conflicts" and there are no red conflict zones. On the fi...

How to use two different Microsoft Interop assemblies in one project ?

I want to use two different Microsoft.Office.Interop assemblies (version 11 and 12) depending on the Office version installed on customer's machine. I've been able to add these two asseblies to my project ( I am using them loccaly - they are in my bin folder, in two diffrent subfolders) , I used aliases on this assemblies to be able to ...

Need help in merge from a development branch to master branch

Hi, I have create a 'dialog' branch and when I try to merge it to 'master' branch. There are 2 conflicts. I don't know how to resolve 'CONFLICT (delete/modify)'. Can you please tell me what to do? $ git checkout master $ git merge dialog CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD. Vers...