conflict

Can I ignore Eclipse's "Duplicate Conflicts" warning when installing a plugin into Eclipse?

After I click the Finish button to install a plugin (the P4WSAD Perforce SCM Support plugin): ...I get a Duplicate Conflicts dialog: This seems strange, since I'm not installing any "Mylyn" plugins, but perhaps they're updating automatically as a result of the plugin I'm trying to install. Apparently the existing version of the pl...

How to force rebase when same changes applied to both branches manually?

My repository looks like: X - Y- A - B - C - D - E branch:master \ \ \ \ merge master -> release \ \ M --- BCDE --- N branch:release Here "M - BCDE - N" are manually (unfortunately!) applied changes approximately same as separate comm...

Ruby is already using the class name of my model

I'm making a forum application with various levels of authorization, one of which is a Monitor. I am doing this by extending my User class, and I plan on fine tuning this with "-ship" classes (e.g. administratorship, authorship, moderatorship, etc.). Apparently the Monitor class is part of ruby mixin. How do I keep my resource name wi...

JIRA - Resource Availability and Utilization Tracking - Across multiple projects

Was wondering if anyone knows of a plugin for JIRA that would provide a consistent view on a daily / weekly / Monthly / etc. basis for People / Resource Tracking and forecasting of resource availability - especially if resource could be used on multiple "projects" potentially. Current Tasks assigned with duration and period of effort F...

C++: namespace conflict between extern "C" and class member

Hi, I stumbled upon a rather exotic c++ namespace problem: condensed example: extern "C" { void solve(lprec * lp); } class A { public: lprec * lp; void solve(int foo); } void A::solve(int foo) { solve(lp); } I want to call the c function solve in my C++ member function A::solve. The compiler is not happy wit...

How to use Mysql variables with Hibernate ?

Hello, I need to use a native sql query in Hibernate with use of variable. But hibernate throws an error saying: Space is not allowed after parameter prefix So there is a conflict with the := mysql variable assignment and hibernate variable assignment. Here is my sql query: SET @rank:=0; UPDATE Rank SET rank_Level=@rank:=@rank+1 O...

How to detect column conflicts with Hibernate?

So let's say I have an ArrayList full of Products that need to be committed to the database via Hibernate. There are already a large number of Products in the database. Each product has an ID. Note this is NOT the PK that is autogenerated by Hibernate. My questions is: what is the best way to detect conflicts with this ID? I am looking ...

SimpleModal plugin is causing jQuery conflict with Spring DWR

Hi, I'm using SimpleModal plugin (http://www.ericmmartin.com/projects/simplemodal/) for generating a simple modal dialog. Now the application I'm using this in had some previous code that uses Spring MVC - DWR Ajax framework. I believe it uses jQuery internally. Now when I include the jQuery file in this project and use the plugin, t...

Jquery UI Autocomplete widget conflict qith jqeury.menu widget - how can I solve it?

My app already has a completed menu using jquery.menu.js found at http://wiki.jqueryui.com/Menu. I'm now also trying to add the jquery autocomplete widget from jquery ui 1.8.1 - but both of these have a .menu() function that conflicts with each other. If I put jquery-ui-1.8.1.custom.js first in the head, then autocomplete works but the...

Systematically resolve conflicting styles in css

I have some stylesheets from different sources in my web project. I want to harmonize them. Some styles I need from the one, some from the other. Is there a tool or method how to systematically resolve style conflicts? I tried IE8 developer tool, and yes, it is possible to view conflicts at the level of each element. But I have many e...

Tapestry + JaxB conflict

Hi all ! I need your help to resolve a conflict between Tapestry and JaxB. The error is : com.sun.xml.stream.ZephyrParserFactory cannot be cast to org.codehaus.stax2.XMLInputFactory2 I find a way to resolve it, but it is for jetty : http://tynamo.org/tapestry-resteasy+guide The solution seems to be to add a system properties...

jQuery and MooTools Conflict

Okay, so I got jQuery to get along with MooTools with one script, by adding this at the top of the jQuery script: var $j = jQuery.noConflict(); and then replacing every: $( with $j( But how would you get MooTools to like the following script that using jQuery?? Thanks in advance for any input, Tracy //Fade In Content Viewer: ...

MooTools and jQuery conflict - despite Dollar Safe Mode

I'm trying to get some pre-existing MooTools code to function properly within a Drupal site. I know the MooTools code works on its own. Once I load the MooTools library in the page, jQuery stops functioning. I am including MooTools after jQuery, which (according to the MooTools developers) should prevent Moo from stealing the already de...

JavaCC: How can I make generated boilerplate classes package-private?

Hello, everyone! I know that I can specify the option SUPPORT_CLASS_VISIBILITY_PUBLIC = false; inside a .jj file. But this makes only the generated class itself package-private. The "boilerplate" classes (such as ParseException) are still public. This is very annoying, since I use java.text.ParseException for public exposure of the API...

Problems with noobs putting my GA code into their sites

I don't mean for the title to be derogatory, but this is a rather frustrating problem, and I'm looking for a good workaround, given a language barrier involved. I have a site set up for a plugin I wrote, and, rather than use the site's resources to write their own code, I've had people simply rip the code from the samples on the site. N...

Conflict between some JavaScript and jQuery on same page

I am using a JavaScript function and some jQuery to perform two actions on a page. The first is a simple JS function to hide/show divs and change the active state of a tab: This is the JS that show/hides divs and changes the active state on some tabs: var ids=new Array('section1','section2','section3'); function switchid(id, el){ ...

SVN hook script conflict

I am trying to write a pre-commit hook script that will alter a specific svn-property of a folder/file. The script looks fairly similar to the one that is documented in the svn book. I figured out how to set/change the property of a node and when executing the binding function svn.fs.commit_txn the property of the node actually gets set...

Jquery and Prototype Conflict

I am having trouble running two javascript files on the same page. I used JQuery.noConflict() (http://api.jquery.com/jQuery.noConflict/) but no luck. <script src="http://www.google.com/jsapi"&gt;&lt;/script&gt; <script> google.load("prototype", "1.6.0.3",{uncompressed:false}); google.load("scripta...

Subversion commit conflict

I use Subversion mainly to synchronize work between two computers I use on a daily basis (and as a backup, since I have a checked-out copy of the repository on each computer). I keep the main repository on a USB flashdrive. I recently came across the following error when trying to commit a current working copy (and both working copies,...

Remote merge conflict resolution with local GUI tools

I would like to use a GUI app on my Mac (Changes http://connectedflow.com/changes/) to resolve merge conflicts when using Mercurial via SSH on my server. What is the most straightforward way to achieve this without cloning the repository locally? ...