Search Results

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

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

• SVN hook / svn up / conflict

  - by Schubhan

  When I do a Svn up in a file with a local modification that can produce a conflict. Is it possible to cancel svn update with a hook and write a message? Thanks

  Read the article

• Why TortoiseHg not show the "merge conflict"?

  - by Jian Lin

  Short version of the question: Since I already have TortoiseHg, I right clicked on that file trying to see the merge conflict visually, but there is no way to see it? Details: To make a simple case of merge conflict, I hg init a repo on Win 7, and then clone it to another folder. Now, in one working directory, i added the line "the code is 123",…

  Read the article

• Static route in conflict with a default route

  - by Ossan Sokiv

  Hi guys, I have a default route configured. 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1 I'd like to add a static route to pass traffic destined for 192.168.1.51 via a load balancer's redundant virtual interface at 192.168.1.2. ip route add 192.168.1.51 mask 255.255.255.255 via 192.168.1.2 When I try to add the static…

  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. 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 SMTP server in IIS6 manager. I'm worried that none…

  Read the article

• jQuery Prototype conflict, alternative solutions

  - by lbolognini

  I have a problem as I'm conditionally including the Prototype-based Lightbox script for IE6 as it works better than the jQuery plugin. Of course the two libraries conflict but the official solution is not really feasible for me as i would have to replace tons of $ with the alternative no-conflict syntax. Is there any other solution for me,…

  Read the article

• Which assemblies conflict in "found conflict between different versions" ?

  - by ripper234

  I am getting "found conflict between different versions" from one of my projects. How do I find out which assemblies are actually in conflict?

  Read the article

• rpm file conflict after alien conversion

  - by Zitrax

  I have a program for which I generate a .deb file. The .deb file works fine on the systems I have tried it on (also tested with lintian). Previously it has worked to use alien to convert this to .rpm and install it on Suse. However it is now about a year since I tried it the last time and now I get an error when trying to install the alien…

  Read the article

• SVN 409 conflict on commits and updates

  - by bhefny

  We have been using SVN for the past year now and when we migrated to an online server we started getting this error: Commit: Commit failed (details follow): File or directory 'x.php' is out of date; try updating resource out of date; try updating CHECKOUT of '/!svn/ver/491/x.php': 409 Conflict (http://svn.example.com) We are currently…

  Read the article

• conflict in debian packages

  - by Alaa Alomari

  I have Debian 4 server (i know it is very old) cat /etc/issue Debian GNU/Linux 4.0 \n \l I have the following in /etc/apt/sources.list deb http://debian.uchicago.edu/debian/ stable main deb http://ftp.debian.org/debian/ stable main deb-src http://ftp.debian.org/debian/ stable main deb http://security.debian.org/ stable/updates main …

  Read the article

• Subclipse > Accidental Merge Conflict Resolution

  - by DTS

  I'm trying to merge changes from one branch into another using Subclipse. On a particular file in a particular subdirectory, I had a file conflict and edited the conflicts via the context menu option for this. However, when I went to resolve the conflict I apparently chose the wrong option and was left with the original unmerged file in…

  Read the article

• Avoid Resource Conflict

  - by Yan Cheng CHEOK

  I have a MFC exe, trying to dynamic load a MFC dll. // This is code in MFC exe HINSTANCE h = AfxLoadLibrary(_T("DLL.dll")); typedef void(*FUN)(); FUN fun = (FUN)GetProcAddress(h, "loveme"); FreeLibrary(h); Both MFC exe and MFC dll, are having their own resource file. However, I realize that, if MFC exe and MFC dll are having a same…

  Read the article

• How to avoid CSS conflict using jquery?

  - by user2885137

  I am experiencing a CSS conflict issue. Here are the details: I have a search results page in which products are shown in grid format. The CSS for that is grid search results is "product-grid.css" which is included header of the page. On this page I have button which when clicked shows the search results in list format. The css for…

  Read the article

• cPAddons version conflict with Wordpress

  - by Joel Alejandro

  I have multiple users on my CentOS 5.7 server with WHM/cPanel, who have installed WordPress 3.2.1, and eventually did a manual update to 3.3.1, from Wordpress itself. Now the version of WP for those users doesn't match th one detected by cPanel, and of course, "Upgrade" doesn't work because the directory can't be cleaned (WP is…

  Read the article

• htaccess rewrite and auth conflict

  - by Michael

  I have 2 directories each with a .htaccess file: html/.htaccess - There is a rewrite in this file to send almost everything to url.php RewriteCond %{REQUEST_URI} !(exported/?|\.(php|gif|jpe?g|png|css|js|pdf|doc|xml|ico))$ RewriteRule (.*)$ /url.php [L] and html/exported/.htaccess AuthType Basic AuthName "exported"…

  Read the article

• Windows 7 Goes to Sleep in conflict with Power Option Setting

  - by Decker

  My Del Dimension E521 running Windows 7 puts itself in sleep mode each night -- despite the fact that I have chosen a power option that specifies NEVER Each morning I find the monitor blank and I have to hit the power button on the PC at which point Windows "resumes". The system event log shows this: Source: …

  Read the article

• svn .xcodeproj conflict / transaction issue?

  - by Stephen Furlani

  Hello, I am trying to add my xcodeproj file/folder thingy to my svn repository. medwall-macmini-1:Summer2010 pebble$ svn add CoreDataTrial.xcodeproj A CoreDataTrial.xcodeproj A CoreDataTrial.xcodeproj/pebble.pbxuser A CoreDataTrial.xcodeproj/pebble.perspectivev3 A …

  Read the article

• htaccess rewrite and auth conflict

  - by Michael

  I have 2 directories each with a .htaccess file: html/.htaccess - There is a rewrite in this file to send almost everything to url.php RewriteCond %{REQUEST_URI} !(exported/?|\.(php|gif|jpe?g|png|css|js|pdf|doc|xml|ico))$ RewriteRule (.*)$ /url.php [L] and html/exported/.htaccess AuthType…

  Read the article

• Possible boot conflict?

  - by Evan Kroske

  I was installing Ubuntu on a computer on which Windows XP was already installed. The computer has multiple hard drive bays, so I decided to remove the XP HDD and install Ubuntu on a blank HDD when it was the only HDD in the system. Unfortunately, if I now try to boot Ubuntu with the Windows XP…

  Read the article

• php-common causing conflict

  - by Cornwell

  I'm trying to install php-pdo but it always fails because of php-common bash-3.2# yum install php-pdo Loaded plugins: fastestmirror Loading mirror speeds from cached hostfile * epel: fedora-epel.mirror.lstn.net Setting up Install Process Resolving Dependencies --> Running transaction…

  Read the article

• mod_ssl RPM conflict

  - by 0A0D

  I build Apache httpd into an RPM using these sites: http://erikwebb.net/blog/compile-and-install-apache-24-red-hat-enterprise-linux-rhel-6-or-centos-6 http://ramblin-dude.blogspot.com/2013/04/compiling-rpm-for-httpd-on-rhel-57.html I was successful at building apr* and httpd*.…

  Read the article

• JBoss naming service port conflict

  - by Kramer

  I am having trouble getting JBoss started. I am running JBoss 5.1.0 on Mac OSX (yes, I know it is an old version, but that’s what the application is certified on for now). I am using Apple’s JVM 1.6.0_37. I get the following error when trying to use JBoss (there are some more…

  Read the article

• Library conflict in Mac OS X

  - by Juan Medín

  I was trying to install the ImageMagick library on Mac OS X Snow Leopard, and first I tried port and, after it failed, homebrew. It updated some dependencies and installed ImageMagick without problems. So far so good. The problem came when I ran Apache. I got the following…

  Read the article

• ZendServer uninstall and xampp install ports conflict

  - by BlackFire27

  I uninstalled zend, cleaned it from the registry (it doesnt exist there).. when I go to localhost , I can see its favicon. Also my xampp port is blocked by the previous installation of zend that uses the port 80.. so I swapped xampps port to 8080.. it works..but I would…

  Read the article

• Bridging and iptables SNAT conflict

  - by sad_admin

  Hello I am working on a setup here and have it working with one minor exception. Devices on one side of my bridge aren't getting SNAT'd to the Internet. The Diagram / Overview: Primary_Network (Site_A) | | Internet ------- Linux_Bridge_GW…

  Read the article

• VLAN Configuration Conflict, Who Wins?

  - by Kevin

  I'm new to VLANs, so take that into consideration... Lets say that I had a server set up to create a virtual interface that is set to be tagged as VLAN 3. For example, the following Debian config: iface eth0.1 inet static address 192.168.1.1 netmask…

  Read the article

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