conflict

iepngfix.htc and jQuery conflict

Hi, I use iepngfix.htc for png in IE6 and jQuery(noConflict mode). iepngfix.htc doesn't work with jQuery, which means png transparency doesn't work. It's strange. How can I avoid this? Thanks. Sam ...

How can I delete Perforce changelist items erroneously marked as in conflict?

I have a couple of .refresh files that have somehow found their way into my perforce default pending changelist and from there somehow started showing as being in conflict with their depot counterparts. They are un diffable, unresolvable, I have excluded the files from being compared using the instructions on the perforce website and ye...

git resolving conflicts question

Hi, I have to solve some conflict after a "git pull". $ git pull CONFLICT (rename/add): Renamed vignette_generator_mashed.h->vision_problem_8.h in 49423dd0d47abe6d839a783b5517bdfd200a202f. vision_problem_8.h added in HEAD Added as vision_problem_8.h~HEAD_1 instead Removed vignette_generator_cross_square.cc Automatic merge failed; fix c...

Which SCM/VCS cope well with moving text between files?

We are having havoc with our project at work, because our VCS is doing some awful merging when we move information across files. The scenario is thus: You have lots of files that, say, contain information about terms from a dictionary, so you have a file for each letter of the alphabet. Users entering terms blindly follow the diction...

Xcode and SCM conflict error.

I am getting this following error even though i am the only person working on this project. > Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed why would this occur as all i keep doing is committing the project every time before do some serious coding. I have committed three time...

Exposing a same class twice using WCF

Hi, I have a 2 WCF services that are exposing the same object. Lets say the first service (SerA) exposes a class (classA) and the second service (SerB) which adds the filled classA also exposes this class (as this class is included in the parameters) Now when I retrieve the classA from SerA, it is concatenated with a namespace SerA.cla...

Merge tool capable of merging conflicting changes

I'm currently using TortoiseSVN to do a merge of two branches and I've found that its not smart enough to handle a specific merging senario. In one branch I have a method as follows: MyMethod(parameter1, parameter2, parameter3) In the other branch I have the same method as follows: MyMethod(parameter1, parameter2, parameter4) Tort...

how to solve jquery and mootoools conflict

I use < script type="text/javascript" src="jquery-1.2.2.pack.js"> < /script> to load jquery and then load an external script that contains these : var jkpanel={ controltext: 'menu', $mainpanel: null, contentdivheight: 0, openclose:function($, speed){ this.$mainpanel.stop() //stop any animation if (this.$mainpanel.attr('...

Lag problem with jQuery focus() and blur() events.

I'm attempting to create a navigation menu that uses some jQuery. I wanted keyboard users to be able to have the same experience as mouse users, so I'm duplicating the functionality found in my hover() event handler in my focus() and blur() event handlers. For some reason, this is causing noticeable lag in Firefox and IE when the user cl...

jQuery $(document).ready(); declaring all the functions in it

Explanation: i have few objects and im declaring them inside $(document).ready(). WHY? because in thous objects i have many jquery methods $(..), obviously they can work outside too, but when i include mootool, then it stop working. i tried noConflict and some other things, nothing works, only if i change the $() to jQuery() or to $j()....

Conflict btw two mootools version files

I have one videobox that acts like a lightbox for displaying video using mootools.js file and I am trying to integrate in my web page a menu using mootools-1.2.1-core-nc.js. Is there any way to make this files work togethere without conflicting??? ...

Git merge and resolve any conflicts to current branch.

So I have my master branch, along with branch 'bob'. I've made many changes in both and now I want merge master into bob to keep him updated. The only thing is, if there is a conflict I want it to automatically resolve to bob. I've been recommended the following: git checkout bob git merge master -s ours This does not work because I...

How is this a conflict

Hi, i'm just testing git to find out if i could use it for my work. I ran into a problem that seems small but could become a real one with the real code. My file looks like: text.txt 1 2 3 4 I've a local branch "branch1" and commited changes in both branch and master. In master i changed the first line in the branch the s...

fluent nhibernate collation conflict

hi, really struggling to resolve this issue. using nhibernate Im trying to join two different tables from two different databases but im getting a collation conflict error. To resolve this issue i know i need to append "collate Latin1_General_CI_AS" to the end of my sql string but have no idea how to do it using nhibernate. Error: Can...

console UI tool for resolving merge conflicts in git... like vimdiff but 'easier'

i'm looking for a console UI tool for resolving merge conflicts in git... like vimdiff but 'easier' ...

finding class name conflicts and jar file version discrepancies and redundancies

Most of the time , the developers will be having hard time to debug the issues related to class loading issues for the reasons like 1 . the class path might have two different jars with the same class having different version. 2. class loading issues. Although we could use jar utility to delve into each and every jar , it is going ...

couchdb for /really/ distributed replica

let's say i want to implement a distributed database (each node being the replica of the others); i hear that cdb is able to easily sync between two nodes and at least support some form of conflict resolution. unfortunately i don't know couchdb therefore i have to ask: how's the situation for a "graph" of nodes? let's say we have a thou...

Visual C++ 2008 Express - cpp filename conflict

I'm developing application for GNU/Linux using gcc 4 and cmake to manage compilation process. I found that is has no problems when there are two files with the same name but in other directory and namespace like this: . |-- gfx | |-- Object.cpp | `-- Object.h `-- logic |-- Object.cpp `-- Object.h First Object...

When strip_tags() Burns a Haystack

I've got a list of websites for each US Congress member that I'm programmatically crawling to scrape addresses. Many of the sites vary in their underlying markup, but this wasn't initially a problem until I started seeing that hundreds of sites were not giving the expected results for the script I had written. After taking some more tim...

Prototype and jQuery together?

I noticed that a certain script I use relies on prototype. (Lightbox 2) Will it work together on the same page as jQuery? Is there way to make sure that they don;t conflict? ...