Search Results

Search found 959 results on 39 pages for 'conflict'.

Page 4/39 | < Previous Page | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >

• svn merge from trunk to branch conflict for a file deleted in the trunk

  - by Riccardo Galli

  After a subversion merge from trunk to branch, I got a conflict because a file has been deleted in the trunk and modified in the branch. I would like to keep the trunk choice, but using "svn resolve --accept theirs-full" from the branch directory tells me svn: warning: Tree conflicts can only be resolved to 'working' state; '/path/to/file' not…

  Read the article

• automating write conflict messages

  - by archer

  is there any method to avoid the annoying write conflict messages by automating and hiding the process so that it doesn't appear as if the program is defective? there doesn't seem to be any point to these messages anyway as there is only one real choice which is to drop the changes.

  Read the article

• How do I manage conflict in the workplace?

  - by JoelFan

  My workplace has an excessive amount of personal conflict among developers. There are some legitimate technical disagreements involved, but I wish it could be kept to a discussion about issues and not about people. Is there anything I can do about this from my lowly position, being that I don't have any formal leadership role on the team?

  Read the article

• SVN Tree Conflict Errors

  - by John

  I seem to see such errors quite often in our SVN 1.6 repo. We got these quite a lot while we used to just work on /trunk so I don't think it's due to merge/branching confusion. It seems that a cleup and marking the conflict resolved always works, but it's a little concerning to see errors in your version control system when you're just…

  Read the article

• javascript conflict on accesing DOM

  - by justjoe

  i read this statement from a book i read The Document Object Model or DOM is really not a part of JavaScript but a separate entity existing outside it. Although you can use JavaScript to manipulate DOM objects, other scripting languages may equally well access them too. what is the best way to avoid conflict between javascript and…

  Read the article

• Cannot resolve the collation conflict ???

  - by HAJJAJ

  hi guys I had this error and i don't know how to fix it Message=Cannot resolve the collation conflict between "Arabic_CI_AS" and "SQL_Latin1_General_CP1_CI_AS" in the equal to operation. note: I already change the collation from the database option -- Collation i change it from "Arabic_CI_AS" to "SQL_Latin1_General_CP1_CI_AS" …

  Read the article

• Cannot resolve collation conflict in Union select

  - by phenevo

  Hi, I've got tqo queries: First doesn't work: select hotels.TargetCode as TargetCode from hotels union all select DuplicatedObjects.duplicatetargetCode as TargetCode from DuplicatedObjects where DuplicatedObjects.objectType=4 because I get error: Cannot resolve collation conflict for column 1 in SELECT statement. Second…

  Read the article

• How to get status code(409 for conflict) and message("your code is conflict") through falut event in

  - by Ankur

  I am calling a server method through HTTPService from client side and in response i am sending sending status code(409 for conflict) and message("your code is conflicted") from serverside on error but on client side in fault event i am getting status code 0 and message = "faultCode:Server.Error.Request faultString:'HTTP request…

  Read the article

• How to resolve merging conflicts in Mercurial (v1.0.2)?

  - by lajos

  I have a merging conflict, using Mercurial 1.0.2: merging test.h warning: conflicts during merge. merging test.h failed! 6 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 19 hg merge 18 I can't figure out how to resolve this.…

  Read the article

• JQuery conflict with body onload event.

  - by Evgeny

  Strange conflict in my code. I have function that called from body onload: var someGlobalVar=new SpecialType(); function OnBodyLoad() { someGlobalVar.Bind(); } but when i include JQuery 1.4.2 to my project i have error that someGlobalVar is undefined. Why global variable now is undefined and what ways to fix it?

  Read the article

• Integrating beast in existing rails app (database conflict)

  - by Rick_2047

  Hi, I want to integrate the beast forums in an existing rails app, but there is a database conflict. I already have a "post" model for the blog and beast requires it. How do I eliminate the problem? Regards

  Read the article

• in TFS can we customize the merge algorithm (conflict resolution)

  - by Jennifer Zouak

  In our case we want to igonore changes in code comment headers for generated code. In Visual Studio, we can change the merge tool (GUI that pops up) and use a 3rd party tool that is able to be customized to ignore changes (http://msdn.microsoft.com/en-us/library/ms181446.aspx). Great, so a file comparison no longer highlights…

  Read the article

• Server 2008 Web Edition IIS6 SMTP conflict

  - by user219313

  I'm using IIS6 Manager to setup the SMTP service on Windows Server 2008 Web Edition. Ignoring how mental this is, there seems to be a conflict (port 25?) which means that I cannot start and stop the Default SMTP server within IIS6. I can start and stop it with the services.msc snap in and this is reflected in state of the…

  Read the article

• Operand size conflict in x86 Assembly??

  - by Mark V.

  I'm a novice programmer who is attempting assembly for the first time. Sorry in advance if this is an incredibly lame question. I have a character stored in the EAX register, but I need to move it to my DL register. When I try: mov dl, eax I get an error C2443: operand size conflict. I know that the eax register is 32…

  Read the article

• Tap, Pan for a map & fixed headers - event conflict

  - by kaiser

  I'm currently developing a small WebApp that makes use of Google Maps (front-end uses jquery-ui-maps) jQuery Mobile with a fixed header & footer Now I encountered a conflict that appears on touch enabled devices as well as on desktop/mouse controlled "click" events: When I "tap" or "click" the map to actually "pan"…

  Read the article

• Ontology - Conflict of same individuals property and datatype property

  - by blueomega

  I am having a problem with "same individuals property" in protege, when i run a reasoner (pellet 1.5 or fact++) Lets take ontology example thing has class sons A and B, A has sons C and D. B, C and D have individuals of the same class. Cant i say a individual C is "same individual" as individual B, and then add also…

  Read the article

• Does PHP session conflict with Share-Nothing-Architecture?

  - by Morgan Cheng

  When I first meet PHP, I'm amazed by the idea Sharing-Nothing-Architecture. I once in a project whose scalaiblity suffers from sharing data among different HTTP requests. However, as I proceed my PHP learning. I found that PHP has sessions. This looks conflict with the idea of sharing nothing. So, PHP session is just…

  Read the article

• R: Cut and labels/breaks length conflict

  - by AkselO

  I am working with the cut function to prep data for a barplot histogram but keep running into a seeming inconsistency between my labels and breaks: Error in cut.default(sample(1:1e+05, 500, T), breaks = sq, labels = sprintf("$%.0f", : labels/breaks length conflict Here is an example. I pretend that it is income…

  Read the article

• Possible Conflict with Class name & Property Name?

  - by coffeeaddict

  If you have a namespace that contains a property in ClassA and a class that has the name of that Property somewhere else in your project and both are in the same namespace this won't cause conflicts will it? So lets say I have a class named Car namespace Dealer { class Vehicle { // the main class that…

  Read the article

• Avoid Jquery Plugin Conflict

  - by user1511579

  on the same page i'm using this plugin: $g=jQuery.noConflict(); $g(function() { /* number of fieldsets */ var fieldsetCount = $g('#formElem').children().length; /* current position of fieldset / navigation link */ var current = 1; /* sum and save the widths of each one…

  Read the article

• "Parameter type conflict" when calling Java Stored Procedure within another Java Stored Procedure

  - by GuiPereira

  Here's the problem (sorry for the bad english): i'm working with JDeveloper and Oracle10g, and i have a Java Stored Procedure that is calling another JSP like the code: int sd = 0; try { CallableStatement clstAddRel = conn.prepareCall(" {call FC_RJS_INCLUIR_RELACAO_PRODCAT(?,?)} "); …

  Read the article

• Python/YACC: Resolving a shift/reduce conflict

  - by Rosarch

  I'm using PLY. Here is one of my states from parser.out: state 3 (5) course_data -> course . (6) course_data -> course . course_list_tail (3) or_phrase -> course . OR_CONJ COURSE_NUMBER (7) course_list_tail -> . , COURSE_NUMBER (8) course_list_tail -> .…

  Read the article

• jQuery & Prototype Conflict

  - by DPereyra

  Hi, I am using the jQuery AutoComplete plugin in an html page where I also have an accordion menu which uses prototype. They both work perfectly separately but when I tried to implement both components in a single page I get an error that I have not been able to understand. uncaught…

  Read the article

• collation conflict SQL/SERVER 2008

  - by vikitor

  Hello, I've been going around this but I haven't found a solution for my problem. My sql query is: SELECT dbo.Country.CtyRecID, dbo.Country.CtyShort, dbo.Notification.NotRecID, dbo.Notification.NotName, dbo.TemporalSuspension.TCtsCode,…

  Read the article

• Jquery tools Overlay CSS Conflict, Image positioned under the overlay

  - by Ami Mahloof

  First here's what I'm usingh and trying to do: the minimal setup for this effect: flowplayer.org/tools/demos/overlay/index.html then the Apple Leopard Preview Effect: flowplayer.org/tools/demos/overlay/apple.html Now here's the page I'm having the…

  Read the article

< Previous Page | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >