Search Results

Search found 793 results on 32 pages for 'personality conflicts'.

Page 19/32 | < Previous Page | 15 16 17 18 19 20 21 22 23 24 25 26  | Next Page >

• How to use Winmerge with Git Extensions?

  - by sebastiaan

  I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'm very fond of Winmerge though and would like to replace KDiff with Winmerge. In the Git Extensions settings, there are settings to change the Mergetool, but I can't seem to figure out what syntax I should use and why. There seem to be 4 variables: $BASE, $LOCAL, $REMOTE, $MERGED. It seems that I should pass these to WinMergeU.exe, but with which command line parameters? I've tried to search for this a few times, but there is no answer that actually seems to work.

  Read the article

• jQuery/JSONP widget and jquery version conflict

  - by geraud

  I would like to create a widget so that my visitors can display it on their blog/website. I would like to use jquery and jsonp to develop this widget. I know how to avoid conflicts between jQuery and other libraries (like prototype). But what will happen if jquery is already installed on my visitors' websites and if their version is different from my version ? What I mean is: what if, for example, they run a script using an older jquery version and which is not compatible with my jquery library ? Does it stop working ? Is their any workaround ?

  Read the article

• PHP preg_replace oddity with £ pound sign and ã

  - by Barry Ramsay

  Hello I am applying the following function <?php function replaceChar($string){ $new_string = preg_replace("/[^a-zA-Z0-9\sçéèêëñòóôõöàáâäåìíîïùúûüýÿ]/", "", $string); return $new_string; } $string = "This is some text and numbers 12345 and symbols !£%^#&$ and foreign letters éèêëñòóôõöàáâäåìíîïùúûüýÿ"; echo replaceChar($string); ?> which works fine but if I add ã to the preg_replace like $new_string = preg_replace("/[^a-zA-Z0-9\sçéèêëñòóôõöàáâãäåìíîïùúûüýÿ]/", "", $string); $string = "This is some text and numbers 12345 and symbols !£%^#&$ and foreign letters éèêëñòóôõöàáâäåìíîïùúûüýÿã"; It conflicts with the pound sign £ and replaces the pound sign with the unidentified question mark in black square. This is not critical but does anyone know why this is? Thank you, Barry

  Read the article

• Communicate with the local machine from a web page

  - by Earlz

  Hello. We have a web application. There are physical devices that we need to be able to communicate with, and we have access to all of our clients computers to install whatever software we need. Now, for the question: Is there a way to make this browser-agnostic? As in, not requiring ActiveX controls? One of my ideas was to install a custom made webserver on each client and then have javascript on our webpage that communicates with that webserver. This could be done by the same way that http://earlz.biz.tm javascript can access subdomains assigned to 127.0.0.1 such as http://loopback.earlz.biz.tm The problem with this of course is that the client's custom made webserver would be forced to run on port 80(which will have conflicts at least sometimes), or we would have to use a nonstandard port for our web application, which is quite undesirable. Does anyone else have ideas on how to do this?

  Read the article

• How to undo an hg merge? (I think.)

  - by Grumdrig

  I'm new to collaborating with Mercurial. My situation: Another programmer changed rev 1 of a file to replace 4-space indents with 2-space indent. (I.e. changed every line.) Call that rev 2, pushed to the remote repo. I've committed substantive changes rev 1 with various code changes in my local workspace. Call that rev 3. I've hg pulled and hg mergeed without a clear idea of what was going on. The conflicts are myriad and not really substantive. So I really wish I'd changed my local repo to 2-space indents before merging; then the merge will be trivial (i'm supposing). But I can't seem to back up. I think I need to hg update -r 3 but it says abort: outstanding uncommitted merges. How can I undo the merge, changes spacing in my local repo, and remerge?

  Read the article

• PowerBuilder IDE Customization for SCC

  - by Adam Hawkes

  Our PowerBuilder application is fairly large and has many objects in several PBLs for organizing our code. We often have 10 or more datawindows on one window, and these datawindows may be spread across two or three PBLs. For version control, we use exclusive check-out to avoid merge conflicts. The situation is that when you right-click on a datawindow object from the Window painter you get a context-menu with options like "Script" and "Properties" and "Modify Datawindow...". We'd like to add one for "Check-out..." to avoid having to hunt for the datawindow in several PBLs. Any ideas on how to do this, or something similar, would be greatly appreciated.

  Read the article

• Clean conflicting class files from Temporary ASP.NET Files

  - by Deepfreezed

  Class file Conflicts in C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\Temporary ASP.NET Files\ is preventing me from building the solution. Even though I try emptying out the folder, each time Visual Studio starts the build process, it brings in the class file in to the temp folder with the same folder name. If I restart the machine or leave it overnight, project build without error. Is there anyway to tell Visual studio to delete/ignore/clean any lingering class files that could be in the temp folder? Clean solution option in VS doesn't work either. Class file in conflict are from the App_Code folder.

  Read the article

• Copying Pasting Word 2007 docs to HTML WYSIWYG editors

  - by Graham

  Microsoft word has a ton of proprietary formatting and styles that do not translate well to html WYSIWYG editors. When you paste them over to the html editor and try to edit the pasted info it causes all kinds of clashing styles. I want to be able to keep the general structure but leave out the proprietary stuff. Essentially I want to save clients the headache of having to completely strip out all formatting forcing them to redo all the styling again in the WYSIWYG, but at the same time avoid the conflicts that Word formatting creates. Any ideas?

  Read the article

• WebDAV auto-versioning in Git or Hg or any modern VCS

  - by Marcus P S

  I just recently learned of SVN's auto-versioning feature for WebDAV. Although I understand this is not replacement for proper versioning, with messages documenting change sets, it strikes me as a solid and safe replacement to Dropbox (minus nice GUIs and web pages). However, since commits in auto-versioning are frequent, I'd imagine that Git or Hg would be better suited for this, just because of their more compact databases (although I wonder if the distributed nature of things could make the automation ugly for resolving conflicts). Is this a feature that has been implemented using Git or Hg, as far as anyone knows?

  Read the article

• How to generate a unique hash for a URL ?

  - by Jacques René Mesrine

  Given these two images from twitter. http://a3.twimg.com/profile_images/130500759/lowres_profilepic.jpg http://a1.twimg.com/profile_images/58079916/lowres_profilepic.jpg I want to download them to local filesystem & store them in a single directory. How shall I overcome name conflicts ? In the example above, I cannot store them as *lowres_profilepic.jpg*. My design idea is treat the URLs as opaque strings except for the last segment. What algorithms (implemented as f) can I use to hash the prefixes into unique strings. f( "http://a3.twimg.com/profile_images/130500759/" ) = 6tgjsdjfjdhgf f( "http://a1.twimg.com/profile_images/58079916/" ) = iuhd87ysdfhdk That way, I can save the files as:- 6tgjsdjfjdhgf_lowres_profilepic.jpg iuhd87ysdfhdk_lowres_profilepic.jpg I don't want a cryptographic algorithm as it this needs to be a performant operation.

  Read the article

• How to resolve this VC++ 6.0 linker error?

  - by fishdump

  This is a Windows Console application (actually a service) that a previous guy built 4 years ago and is installed and running. I now need to make some changes but can't even build the current version! Here is the build output: --------------------Configuration: MyApp - Win32 Debug-------------------- Compiling resources... Compiling... Main.cpp winsock.cpp Linking... LINK : warning LNK4098: defaultlib "LIBCMTD" conflicts with use of other libs; use /NODEFAULTLIB:library Main.obj : error LNK2001: unresolved external symbol _socket_dontblock Debug/MyApp.exe : fatal error LNK1120: 1 unresolved externals Error executing link.exe. MyApp.exe - 2 error(s), 1 warning(s) -------------------------------------------------------------------------- If I use /NODEFAULTLIB then I get loads of errors. The code does not actually use _socket_noblock but I can't find anything on it on the 'net. Presumably it is used by some library I am linking to but I don't know what library it is in. --- Alistair.

  Read the article

• Upgrading Visual Studio 2010 RC to RTM

  - by Brant Bobby

  I have the RC build of VS2010 installed on my computer. Now that the RTM build is out, I want to upgrade. Aside from the main Visual Studio package and .NET Framework 4, what else should I remove before I install the RTM build in order to minimize potential breakage/conflicts? VS2010 installs a whole bunch of ancillary packages and I'm not sure which ones have been upgraded between RC and RTM. (Extra credit: I've got another machine that is still running Beta 2. Would the procedure be the same?)

  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 my branch. Since then, I can no longer get this file back into a conflicted state so I can resolve this issue properly. I've tried deleting the file and the directory that contains it, to no avail. Any ideas?

  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 code comments as differences. However when it comes time to checkin, the TFS merge algorith is still prompting us to resolve conflicts. Is there any way to better inform the merge conflict resolution algorithm about which changes are actually important to us? Or can we replace the algorithm or otherwise have it subcontract its work to a 3rd party?

  Read the article

• Monotouch UIScrollView/UIPageView with UITableView as panel

  - by cvista

  Hi I'm building an app which is a guide to festivals. In the app I show lineups. You can see the Ui I have built for this on the video here: http://wmcstar.com/download.html The problem I have is that the scrollview/UIPageView - which does the left/right scrolling through the days, sometimes conflicts (i think) with the up/down scrolling of the days lineup UITableView and crashes. It doesn't crash if I disable scrolling - so the only way to switch between days is by selecting the day and programatically scrolling to the day rather than by using touch gestures. Has anyone else seen this behaviour? w://

  Read the article

• Lightbox for embeddable JavaScript widget? Like Feedback tabs for UserVoice/GetSatisfaction

  - by Eliot Sykes

  There are so many lightboxes to choose from, I'm looking for a very lightweight one to use in an embedded javascript widget that would be used on a number of different web sites. This would work in a similar way to the GetSatisfaction/UserVoice feedback tab. Here are the requirements for the lightbox: Very small javascript download (animation not needed) Self contained, not dependent on any libraries such as jquery, etc. Works in major browsers Lightbox displays HTML content from a given URL Close button (like GetSatisfaction or UserVoice) Dims background Avoids javascript namespace conflicts (or can easily be made to avoid them) CSS styling of lightbox does not interfere with site styling Have you used an existing lightbox scripts for this same purpose with similar requirements? Did you roll your own? Insights welcome! Thanks, Eliot

  Read the article

• Ensuring unique ID attribute for elements within ScriptControl

  - by Andy West

  I'm creating a control based on ScriptControl, and I'm overriding the Render method like this: protected override void Render(HtmlTextWriter writer) { RenderBeginTag(writer); writer.RenderBeginTag(HtmlTextWriterTag.Div); writer.Write("This is a test."); writer.RenderEndTag(); RenderEndTag(writer); } My question is, what if I want to assign the div an ID attribute and have it be unique on the page, even if there are mulitple instances of my control? I've seen other people's code that does this: writer.AddAttribute(HtmlTextWriterAttribute.Id, this.ID + "_divTest"); That will prevent naming conflicts between instances of my control, but what if I've already created a div elsewhere on the page that coincidentally has the same ID? I've also heard about implementing INamingContainer. Would that apply here? How could I use it?

  Read the article

• Merge Microsoft Word documents with TortoiseSVN

  - by Álvaro G. Vicario

  TortoiseSVN has a nice VBA script that allows to merge Microsoft Word documents using Word builtin change tracking functionality. This way, when I merge changes from a branch into the trunk I can resolve the conflicts in Word documents. However, the feature is not as useful as it could because it doesn't track revision changes; it just compares the two documents as a whole. This way, when I merge a revision where one paragraph was added to the document I'm not offered to review this paragraph. Instead, I have to review all the differences between the source and target documents (including stuff like TOC bookmark names). Is it an inherent limitation I cannot override? Or is it due to the fact that my Word version is pretty old? (I'm using Word 2002). Also, if you know about a magic tool or plugin... ;-)

  Read the article

• VS2010 .filter files and SVN

  - by Noah Roberts

  Since we've switched to VS2010 we've noticed a new .filters file that apparently contains the filter structure of the project. We're also using subversion as our source control. Unfortunately, every time we check in now we end up with merge conflicts if anyone's added a file or filter to the project. SVN seems absolutely incapable of merging this file type correctly even though it's text based. It's getting rather frustrating. Is anyone else dealing with this problem? Has anyone found a solution?

  Read the article

• java util iterator but cannot import java.util.iterator

  - by qwertzuiop13

  Given this Code import java.util.Iterator; private static List<String> someList = new ArrayList<String>(); public static void main(String[] args) { someList.add("monkey"); someList.add("donkey"); //Code works when I change Iterator to java.util.Iterator, but import //is not possible? for(Iterator<String> i = someList.iterator(); i.hasNext(); ) { String item = i.next(); System.out.println(item); } } I receive the error: The type Iterator is not generic; it cannot be parameterized with arguments Eclipse tells me that the import java.util.iterator conflicts with a type defined in the same file. lol... ?

  Read the article

• Jquery datePicker

  - by Shane

  I have slight issue with the jquery datepicker in that it displays ABOVE the target box. This is due to the way my page is set up. I found the issue with CSS in my page via firebug, unfortunately it conflicts with about 20 elements. Next I tried hooking into the "beforeShow event" which works but then after the event fires it just recalculates and puts it where ever it wants. beforeShow: function() { $('#ui-datepicker-div').show(); var offset = $('#ui-datepicker-div').offset(); $('#ui-datepicker-div').css({ top: (offset.top + 222) + 'px' }) } Does anyone else have any ideas how how I can reposition this? I just need to move it down by about 200 odd pixels.

  Read the article

• Insert an ajaxified Webpart into an existing MOSS site

  - by mamoo

  Hi everybody, I need to code a webpart which purpose is to asynchronously fetch some documents and display them into an existing page. Unfortunately I have to face a lot of rescritcions and my struggle to find a solution seems useleess so far. 1) I cannot use Microsoft asp.net ajax 2) I must use Jsonp because the called service (page, whatever...) is outside the site's domain. That's not a big problem. 3) I have no possibility to alter the existing page code, so I cannot reference an external library such as JQuery. 4) For the same reason I have no possibility to call my methods on the window.onLoad event, so here the question is: how can I be sure that everything is correctly loaded before triggering my ajax call? 5) Since several instances of the same webpart can be placed into the same page, can there be some possible conflicts among the various js functions?

  Read the article

• Problems with contenttypes when loading a fixture in Django

  - by gerdemb

  I am having trouble loading Django fixtures into my MySQL database because of contenttypes conflicts. First I tried dumping the data from only my app like this: ./manage.py dumpdata escola > fixture.json but I kept getting missing foreign key problems, because my app "escola" uses tables from other applications. I kept adding additional apps until I got to this: ./manage.py dumpdata contenttypes auth escola > fixture.json Now the problem is the following constraint violation when I try to load the data as a test fixture: IntegrityError: (1062, "Duplicate entry 'escola-t23aluno' for key 2") It seems the problem is that Django is trying to dynamically recreate contenttypes with different primary key values that conflict with the primary key values from the fixture. This appears to be the same as bug documented here: http://code.djangoproject.com/ticket/7052 The problem is that the recommended workaround is to dump the contenttypes app which I'm already doing!? What gives? If it makes any difference I do have some custom model permissions as documented here: http://docs.djangoproject.com/en/dev/ref/models/options/#permissions

  Read the article

• How to sync with eclipse target management?

  - by SpliFF

  I've been using the Jcraft SFTP plugin for Team Synchronisation up till now but I ran across a rumour it's being deprecated by "Target Management". Still, despite my best efforts I haven't found any information on HOW you are supposed to setup a sync with RSE/Target Management. Can anybody provide a step-by-step guide or at least clarification on whether this is actually possible right now or just a planned feature. I do my testing locally then sync to the remote - which may have changes made by other users. I want to be able to see differences and deal with conflicts etc just like with the current Team Synchronization framework.

  Read the article

• Sync Framework: SqlSyncProvider ItemConflicting vs ApplyChangeFailed

  - by Paul Smith

  I'm trying to use design a syncronisation application that syncs changes between different SQL Server databases. I came up with a design based around receiving the ItemConflicting event, storing the knowledge associated with the conflict, and resolving all conflicts off-line. However, it seems that I can only get the ApplyChangeFailed event to fire. Is there some reason why SqlSyncProvider does not use the ItemConflicting event? Am I just hooking up to the event wrongly? The reason I care is that the ItemConlficting event allows me to simply log the conflict and continue with the rest of the synchronisation in a way that I can't seem to achieve with the ApplychangeFailed event.

  Read the article

< Previous Page | 15 16 17 18 19 20 21 22 23 24 25 26  | Next Page >