Search Results

Search found 703 results on 29 pages for 'conflicts'.

Page 10/29 | < Previous Page | 6 7 8 9 10 11 12 13 14 15 16 17  | Next Page >

  • Show Visual Studio's Source Control Merge Wizard programmatically

    - by Mike
    Hi, I'm developing a Work item Custom Control and I need to use the standard VS's Merge Wizard for items in source control from my code to allow to user choose the target branch, resolve conflicts etc. I'm pretty sure it's possible in some way (even through the reflection), but I just can't find the proper class in any of VS client assemblies (Microsoft.TeamFoundation.VersionControl.Controls.dll, Microsoft.TeamFoundation.VersionControl.Client.dll). Any help will be appreciated. Best regards, Mike

    Read the article

  • How to configure Beyond Compare 3 for Eclipse conflict resolution?

    - by Peter Boughton
    What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And it suggests TortoiseMerge settings of this: /theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}" But what is the appropriate config for Beyond Compare?

    Read the article

  • SVN Source control issues when merging changes

    - by HollyStyles
    I have seen where changes have been made on one code file by two developers code like this: x++ End up like this: x++ x++ where due to carriage returns being inserted/removed (I think) one line has become silently merged as two lines of the same code (no conflicts) Everything compiles but suddenly tests are failing and weird behaviour ensues. Should this be possible? How do I guard against it?

    Read the article

  • Find the git branch or branches from commit id

    - by Senthil A Kumar
    Hi All, Actually am try to get a report on merge conflicts. I used 'git blame' to see who has changed what line, but i couldn't find the branch and repository name information. Is there a way to find the repository name, branch name and author name of a file from 'git blame' or from commit ids' so that whenever a merge conflict occurs i can send an email to the authors who have touched that file/lines to resolve it. Thnaks Senthil A Kumar

    Read the article

  • long vs. short branches in version control

    - by Vincenzo
    I wonder whether anyone knows some research done with the question "What is good/bad in long/short branches in version control?" I'm specifically interested in academic researches performed in this field. My questions are: What problems (or conflicts) long branches may produce and how to deal with them How to split a big task onto smaller branches/sub-tasks How to coordinate the changes in multiple short branches, related to the same code Thanks in advance for links and suggestions!

    Read the article

  • command line merge tools for windows

    - by hasen j
    Are there command line merge tools for windows? I'm thinking in terms of tools that can be used in conjunction with other tools (e.g. git, unison) to resolve conflicts. Actually, it doesn't need to strictly be command-line based, as long as it "cooperate" with other command line tools (as I mentioned, git for example), then it's fine.

    Read the article

  • How do I process Proxy Digg JSON for use with jQuery?

    - by Brett
    I'm trying to deal with: "Requests made from Javascript running on your web pages must be proxied to avoid same-origin policy conflicts." I know how to work with the JSON once I've got it. But aside from copy-pasting the JSON results via my browser, I don't know how to localize it for use.

    Read the article

  • In Ant, copy all files from a tree of folders into a single folder?

    - by Sam Washburn
    Is it possible to use Ant to copy all the files (not folders) from a hierarchy of folders into one destination folder? For instance, I have a tree like this: res |-images | |-fg.png | +-bg.png +-sounds +-music.mp3 And I would like a result like this: data |-fg.png |-bg.png +-music.mp3 The way things are named, filename conflicts are not an issue. Is this possible to do with Ant?

    Read the article

  • Installing Ruby 1.9.1 on Ubuntu?

    - by Björn
    I wonder about installing the latest version of Ruby on Ubuntu 9.04. Now I can run through the ./configure and make stuff fine, but what I wonder about: how to avoid conflicts with the packaging system? For example if some other package I install depends on Ruby, wouldn't the package manager install the (outdated) Ruby package and in the worst case overwrite my files? So I think I need some way to tell Ubuntu that Ruby is in fact already installed?

    Read the article

  • ASP.NET web control with the same ID

    - by user370401
    On an ASP.NET page, if the ASP.NET elements like <asp:Texbox ID="Textbox1"> appears in more than one place, are they the same Textbox object or are they different objects with the same name "Textbox1"? If the same, "why won't it cause any conflicts?" E.G. runat="server" Text='<%# Bind("Name") %' runat="server" Text='<%# Bind("Name") %' '

    Read the article

  • Merging code with dependencies? - Javascript

    - by RadiantHex
    Hi folks, this might be quite simple, but I must say I'm a bit confused on this topic. I'm writing code based on two popular libraries: jQuery underscore.js I am just wondering what would be the best way to isolate the code and prevent conflicts and how to merge it with its dependencies. By merging I mean putting them within the same file. :) I hope I'm not asking something which is too basic. ...and a last thing MERRY CHRISTMAS EVERYONE! =D

    Read the article

  • Linker warnings when using stdscr (ncurses)

    - by flarn2006
    Okay, so I'm getting these warnings whenever I try to use stdscr in pdcurses: LINK : warning LNK4098: defaultlib "LIBC" conflicts with use of other libs; use /NODEFAULTLIB:library LINK : warning LNK4049: locally defined symbol "_stdscr" imported LINK : warning LNK4049: locally defined symbol "_SP" imported How do I fix this? They're just warnings, but when I run my program, it crashes, so they probably have something to do with it. Especially considering the fact that the line it crashes at is the one that uses stdscr...

    Read the article

  • svn says conflicted but it's really merged (TortoiseSVN)

    - by JoelFan
    Lately I've been seeing behavior where after an update svn shows certain files as "conflicted" but when I try to edit the conflicts, there are none (The "next conflict" and "previous conflict" buttons are disabled and if I scroll through the file, none of the lines are marked red). This seems to have started after I started working from a different repository than I had been working with, but I'm not sure if that's related.

    Read the article

  • Do the ideas of traditional software engineering conflict with the newer agile development technique

    - by fuentesjr
    So as a developer I am seeking to improve not only my coding skills but my design and management skills. Because of this I'm starting to pay more attention to software engineering practices but i'm not sure where agile development fits into the picture. I can appreciate agility in projects but I wonder whether this conflicts with the traditional ways of software engineering practices and research.

    Read the article

  • Persistent (purely functional) Red-Black trees on disk performance

    - by Waneck
    I'm studying the best data structures to implement a simple open-source object temporal database, and currently I'm very fond of using Persistent Red-Black trees to do it. My main reasons for using persistent data structures is first of all to minimize the use of locks, so the database can be as parallel as possible. Also it will be easier to implement ACID transactions and even being able to abstract the database to work in parallel on a cluster of some kind. The great thing of this approach is that it makes possible implementing temporal databases almost for free. And this is something quite nice to have, specially for web and for data analysis (e.g. trends). All of this is very cool, but I'm a little suspicious about the overall performance of using a persistent data structure on disk. Even though there are some very fast disks available today, and all writes can be done asynchronously, so a response is always immediate, I don't want to build all application under a false premise, only to realize it isn't really a good way to do it. Here's my line of thought: - Since all writes are done asynchronously, and using a persistent data structure will enable not to invalidate the previous - and currently valid - structure, the write time isn't really a bottleneck. - There are some literature on structures like this that are exactly for disk usage. But it seems to me that these techniques will add more read overhead to achieve faster writes. But I think that exactly the opposite is preferable. Also many of these techniques really do end up with a multi-versioned trees, but they aren't strictly immutable, which is something very crucial to justify the persistent overhead. - I know there still will have to be some kind of locking when appending values to the database, and I also know there should be a good garbage collecting logic if not all versions are to be maintained (otherwise the file size will surely rise dramatically). Also a delta compression system could be thought about. - Of all search trees structures, I really think Red-Blacks are the most close to what I need, since they offer the least number of rotations. But there are some possible pitfalls along the way: - Asynchronous writes -could- affect applications that need the data in real time. But I don't think that is the case with web applications, most of the time. Also when real-time data is needed, another solutions could be devised, like a check-in/check-out system of specific data that will need to be worked on a more real-time manner. - Also they could lead to some commit conflicts, though I fail to think of a good example of when it could happen. Also commit conflicts can occur in normal RDBMS, if two threads are working with the same data, right? - The overhead of having an immutable interface like this will grow exponentially and everything is doomed to fail soon, so this all is a bad idea. Any thoughts? Thanks! edit: There seems to be a misunderstanding of what a persistent data structure is: http://en.wikipedia.org/wiki/Persistent_data_structure

    Read the article

  • Current tasks count at Appengine Task Queue

    - by splix
    Are there any ways to get count of current unfinished tasks at Google Appengine development server? I need it for making my integration test. I found a way to get this when running it local (just in mem), as described at appengine docs. But when i'm running it as a standalone server, from maven, this doesn't work. Just because library appengine-testing conflicts with Appengine SDK classes, and i can't use those classes together, when running sdk dev server.

    Read the article

  • Managing conflicting ivy repositories (in eclipse)

    - by Stephen
    I've got eclipse workspaces for my full time job and my home test work that are both set up with ivy (and using ivyDE). However, I'm finding that I'm getting strange behaviour and conflicts between the different workspaces - issues like not being able to find certain dependencies, or not compiling etc. Is there a way in ivy or ivyDE to set the home .ivy2 directory so that I can split my workspaces? At the moment, I'm alternating different directories for my .ivy2 cache.

    Read the article

  • dirname(__FILE__) VS setting global variable to directories

    - by SAFAD
    what are the pros and cons of using this : $globals['server_url'] = dirname(__FILE__); $globals['mainfiles'] = dirname(__FILE__).'/main'; and the pros and cons of using this : $globals['server_url'] = '/srv/www/htdocs/somwhere/'; $globals['mainfiles'] = '/srv/www/htdocs/somwhere/main'; And what do you suggest. by the way: these are set in config.php file which is called by other files as well, to stop directory conflicts when including files we use it like this : require_once($globals['server_url'].'/test.php');

    Read the article

  • Move your Working Copy

    - by coffeeaddict
    I tried to find out how to move my working copy. I know SVN move can be used to move files and folders inside your working copy but what about the working copy itself? I want to move it because I created a branch in a folder location that's different from my branch and had updated therefore all my .NET project references. So when I go to merge back to the mainline trunk I get a bunch of tree conflicts.

    Read the article

< Previous Page | 6 7 8 9 10 11 12 13 14 15 16 17  | Next Page >