Search Results

Search found 2185 results on 88 pages for 'merge'.

Page 13/88 | < Previous Page | 9 10 11 12 13 14 15 16 17 18 19 20  | Next Page >

• Is there a 3 way merger tool that “understands” common refactoring?

  - by Ian Ringrose

  When a simple refactoring like “rename field” has been done on one branch it can be very hard to merge the changes into the other branches. (Extract method is much harder as the merge tools don’t seem to match the unchanged blocks well) Now in my dreams, I am thinking of a tool that can record (or work out) what well defined refactoring operations have been done on one branch and then “replay” them on the other branch, rather than trying to merge every line the refactoring has affected. see also "Is there an intelligent 3rd merge tool that understands VB.NET" for the other half of my pain! Also has anyone try something like MolhadoRef (blog article about MolhadoRef and Refactoring-aware SCM), This is, in theory, refactoring-aware source control.

  Read the article

• How do I git reset --hard HEAD on Mercurial?

  - by obvio171

  I'm a Git user trying to use Mercurial. Here's what happened: I did a hg backout on a changeset I wanted to revert. That created a new head, so hg instructed me to merge (back to "default", I assume). After the merge, it told me I still had to commit. Then I noticed something I did wrong when resolving a conflict in the merge, and decided I wanted to have everything as before the hg backout, that is, I want this uncommited merge to go away. On Git this uncommited stuff would be in the index and I'd just do a git reset --hard HEAD to wipe it out but, from what I've read, the index doesn't exist on Mercurial. So how do I back out from this?

  Read the article

• svn reintegrate a branch with externals fails

  - by dnndeveloper

  using svn 1.6.6 with tortoisesvn 1.6.6 what I am doing: 1) Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files) 2) Create a branch from the trunk and update the entire project 3) Modify a file on the branch and commit the changes, then update the entire project. 4) Merge - "Reintegrate a branch" when I get to the last screen I click "test merge" and get this error: Error: Cannot reintegrate into mixed-revision working copy; try updating first I update the entire project and still the same error. other observations: If I "Merge a range of revisions" everything works fine. If I remove the externals everything works fine using either "Merge a range of revisions" or "Reintegrate a branch" Anyone else having this issue?

  Read the article

• How to compare/merge between XIB files?

  - by sasayins

  Hi guyz, I have these two XIB files. The first one edited by my friend to add features and to other one edited by my self and add another features. My problem is how can i merge the two files? I know that XIB files are XML based and I can use some compare tools to merge it. But I think there will be some conflicts. What is the best way to compare or merge between XIB files? Thanks a lot guys. sasayins

  Read the article

• Web-based document merge solution?

  - by rugcutter

  We are looking for a web-based document merge solution. Our application is a web-based project management tool built using Xataface - PHP on Windows IIS + mySQL. We have a function that allows the user to generate a status report in Microsoft Word format based on data in the tool. Currently this function is implemented using LiveDocX. We have a status report template, and LiveDocX performs the merge into the template using data from our project management tool. The main drawback is LiveDocx is web-service based. We are looking to replace LiveDocX in order to reduce our dependence on the up-time of a third-party web-service that we cannot control. Does anyone have any suggestions on a web based document merge solution that I can install on my IIS or PHP based server?

  Read the article

• Mercurial Messing Up csproj Files?

  - by alphadogg

  I am using Hg to manage and merge code with three other developers involved in a VS2008 project. We do have an .hgignore file that ignores a fair number of files not necessary to track, such as *.pdb, *.obj, etc. However, we do track .csproj files. Periodically, it would seem that files go missing after a merge. We would get build issues, and have to relocate files which were in the project folders, but not in the csproj file. Eventually, I noted during a merge conflict that sometimes Hg seems to merge incorrectly. Here's a screenshot below. The actual conflict that requires manual intervention is lower in the file. But in this section, hg incorrectly replaces DirectoryTasks.cs with a new, different file called ReportTasks.cs, when in fact, both should be added. How do people manage to avoid this?

  Read the article

• Subversion has --record-only for merges, how do I do the same in Git ?

  - by Paul Hammant

  I have a repo where 'master' is going in a certain direction, and a second branch 'foo' is going to be divergent for a couple of commits, then track all subsequent changes to 'master' after that. This is all by choice of course. In Subversion you could do a --record-only merge to mark things as "merge has happened" even though no actual changes were committed. i.e. this change the merge-tracking numbers in properties attached to directories in the target branch. I have had a play with.. git merge --no-commit master .. as something I may be able to tinker with before I do the commit, but it is making a hell of a mess of the target branch for part of the change in question (rename followed by delete). There must be an easier way.. ? Paul

  Read the article

• How do people manage changes to common library files stored across mutiple (Mercurial) repositories?

  - by mckoss

  This is perhaps not a question unique to Mercurial, but that's the SCM that I've been using most lately. I work on multiple projects and tend to copy source code for libraries or utilities from a previous project to get a leg up on starting a new project. The problem comes in when I want to merge all the changes I made in my latest project, back into a "master" copy of those shared library files. Since the files stored in disjoint repositories will have distinct version histories, Mercurial won't be able to perform an intelligent merge if I just copy the files back to the master repo (or even between two independent projects). I'm looking for an easy way to preserve the change history so I can merge library files back to the master with a minimum of external record keeping (which is one of the reasons I'm using SVN less as merges require remembering when copies were made across branches). Perhaps I need to do a bit more up-front organization of my repository to prepare for a future merge back to a common master.

  Read the article

• Svn: revert file content changes without reverting any related mergeinfo?

  - by George Hawkins

  If you've done a merge you may find, before committing the changes, that actually you don't want to accept any of the changes merged into one of the affected files. So you do e.g.: $ svn revert foo.c However this also seems to revert the mergeinfo related to this file. So when you do a subsequent merge it will merge in exactly the same changes again. Rather than revert one could do: $ svn cat foo.c foo.c But this doesn't seem like the right way to do things? Is there something that more clearly indicates what I'm trying to achieve, i.e. to say "consider the merge done for this file but don't change its contents"?

  Read the article

• Reintegrate a branch with externals fails in SVN

  - by dnndeveloper

  What I am doing: Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files) Create a branch from the trunk and update the entire project Modify a file on the branch and commit the changes, then update the entire project. Merge - "Reintegrate a branch" when I get to the last screen I click "test merge" and get this error: Error: Cannot reintegrate into mixed-revision working copy; try updating first I update the entire project and still the same error. Other observations: If I "Merge a range of revisions" everything works fine. If I remove the externals everything works fine using either "Merge a range of revisions" or "Reintegrate a branch". How do I solve this issue? I am using Subversion 1.6.6 with TortoiseSVN 1.6.6.

  Read the article

• Problem doing SVN Vendor Branch - merge

  - by Gyan

  Hi, I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code) I followed all the steps to create the vendor branch:: created the vendor branch for old version (3rd party library) created the vendor branch for latest version (3rd party library) copied the latest version to current folder using (usign svn_load_dirs.pl script) structure of vendor repository in svn URL/vendor/library/3.5.0 URL/vendor/library/3.7.0 URL/vendor/library/current I have the library-3.5.0 used/modified at URL/trunk/library/customized-library I have a problem when I try to merge the difference between URL/vendor/library/3.7.0 and URL/vendor/library/3.5.0 to URL/trunk/library/customized-library I am at the folder where URL/trunk/library/customized-library is checked out and I use following command to do the merge svn merge URL/vendor/library/3.5.0 URL/vendor/library/current . --accept PARAMETERS when I use theirs-conflict for accept parameter, It ignores all of my changes to the old version and copies files from 3.7.0 when I user mine-conflict, it ignores the files in 3.7.0 when I use postpone, it throws exception "tree conflict" Thanks Gyan

  Read the article

• commit/update/merge commands in svn

  - by ajsie

  i want to know exactly when i should use either of commit, update and merge command in svn. after i've checked out a project and altered the code, should i use update, commit or merge to stay in sync? correct me if im wrong: update = all changes in the repo is copied to your local project. commit = all changes in your local project is copied to the repo. merge = same as above, but you determine the direction? when do i use each command above?

  Read the article

• A lot to merge after creating a new branch in SVN

  - by homaxto

  We have recently made a new branch, let us call it rel3.6, which was based on the last release named rel3.5. Work has started on rel3.6, and meanwhile some bugs has been fixed on rel3.5 which now is used for a service pack to be released soon. Today I wanted to merge those bugs from rel3.5 to rel3.6, so I fired up SmartSVN. Standing in the rel3.6 branch i chosed\ to merge with rel3.5 and selected to browse for a revision range. To my surprise there was a huge list of changes even though I checked "Stop on copy" and only showing mergeable revisions. Most of them where dated back before the creation of rel3.6. I did not expect to find anything from before rel3.5 was created. If I make a merge, the only thing I get are changes and conflicts to directory properties. Have I misunderstood something, or is it possible that something was done wrong when creating the branch?

  Read the article

• TFS merging for users that are used to VSS

  - by JacksonD

  I just migrated a team of 7 developers from VSS to TFS. I migrated all of their code into a DEV folder which I then branched into a QA folder (which I branched into a PROD folder). The developers usually don't work on the same files, but there are some shared utility classes. All of the code is for a large ASP.NET web site. When the developers are ready to merge from DEV to QA, they only want to merge their changes. For example, let's say that Developer1 has been working on a project for the last 3 months and he's ready to merge all of his code into QA. However, Developer2 has been working on a different project for the last 2 months which is not ready to be merged. Developer1 and Developer2's changes are not in any way dependent on each other, but they are not separated into different folder structures and they each regularly do a get latest. There doesn't seem to be a way for developer1 to only merge his changes without also merging all of developer2's changes. Currently, developer1 is going through the Pending Changes window and 'Undoing Pending Changes' for all of Developer2's changes, but this is time consuming. They could merge each file individually, but this is also time consuming. Is there an easier way? I am going to have a coronary if I hear one more person explain how much easier it was to work in VSS.

  Read the article

• CC.NET File merge task and dynamic values

  - by ccnet

  How can I use CCNetLabel in the file merge task? From what I have found I have to use dynamicValues. I have somethink like this and it is not working any help? <publishers> <merge> <dynamicValues> <replacementValue property="files"> <format>D:\Testoutput\{0}\*.xml</format> <parameters> <namedValue name="$CCNetLabel" value="Default" /> </parameters> </replacementValue> </dynamicValues> </merge> <xmllogger /> <modificationHistory onlyLogWhenChangesFound="true" /> <statistics /> </publishers>

  Read the article

• Is it safe to use a subversion feature branch after reintegrate-merged to trunk?

  - by ripper234

  Must a feature branch be deleted after it's merged (reintegrated) back to trunk? I prefer to constantly merge changes back and forth from my feature branch - I believe this keeps the conflicts to a minimum. Yet I understand that once you use the reintegrate merge to trunk, a feature branch should be deleted. Is it so? Why? What can I do to circumvent this? Update I'm asking about technical problems that come from the tool, not "methodology concerns". I intend to keep working on the feature branch after the merge. Update the top answer indeed specifies a rather complex procedure (merge, delete & rebranch). Is there an easy way to accomplish this in TortoiseSVN? Shouldn't there be?

  Read the article

• Android: Sorting a merged cursor

  - by tonyc

  Hi, I'm wondering if there's any way to merge two cursors together and then resort them. I can easily merge two cursors together by using a MergedCursor, but that doesn't sort them. I have two sets of contacts in two separate cursors (with totally different schemas) and I want to merge them and sort them by name (the name column is different in the two cursors). Is this possible? Thanks, Tony

  Read the article

• Merge object from list by comparing one value

  - by Bala

  I have two List of Objects (one is master list and other is error list) and if there is a match of one value when compared two lists then merge all other error list values into mast list value (only one object). Other than iterating is there any other way to compare a value and then merge that object. Object is a Value object with some setters and getters. Appreciate your help. List<OrderVO> masterList; List<OrderVO> errorList; If errorList.OrderVO.getOrderID = masterList.OrderVO.getOrderID then masterList.OrderVO.merge(errorList.OrderVO) or copy all values of masterList.OrderVO.copy(errorList.OrderVO). Hoper this is clear

  Read the article

• how to update and merge branch in netbeans?

  - by ajsie

  im using netbeans with svn. i've checked out a project and then i used "copy to..." and chose to copy the trunk to a branch. i deleted the working copy of the trunk and checked out the newly created branch into a working copy and made some changes both in the trunk and the branch. now..how do i update the branch with the new data of the trunk and how do i merge the branch with the trunk using netbeans? is this possible? cause with "merge to..." i could only chose to merge from a remote repository to a local folder.

  Read the article

• Indesign Import XML into Automatic Page generation, data merge

  - by taudep

  I've created some InDesign Pages that I want to use as templates. I've created an XML file with all the appropriate data. I want to merge the XML data with the InDesign page and have a few hundred pages automatically generated. I've been reading online and working with InDesign's "Import XML" features without any luck. The documentation has been pretty poor for me. And Google searches haven't returned much fruitful. Edit: I'm updating this to now include my present steps 1) I create a Master Page of my template 2) I add a bunch of text frames where I want the imported data from the XML file to be places 3) I open the "Tags" window and Import and XML file 4) I mark my text frames in the Master Document with the appropriate tags 5) I then add a lot of pages (like 200) to the document 6) Then I use "Import XML" to try and get the data brought in and filled across all 200 pages. This is where I fail. So there's something I'm missing. It might be that InDesign doesn't work as I'm expecting... Anyone have any good tips for mail-merge like functionality with an XML document and auto-generation of InDesign pages? BTW, here's an example of Adobe's great documentation for merging repeated XML elements. There's gotta be more...InDesign CS4 Docs: XML-Importing XML-Working with Repeating Data EDIT: Here's some of the sample XML, notice the ITEM will repeat. I've also truncated the data in the "desc" tag: <output> <item> <user_name>taude</user_name> <date>2009-02-21</date> <title>Wishful Thinking</title> <desc>Skiing up in Vermont on a beautiful day. This photo of</desc> <thumbnail>http://www.blipfoto.com/thumbs/5371/2009/big/color/96104200949a162672e1996.15963073.jpeg</thumbnail> </item> <item> <user_name>taude</user_name> <date>2009-02-22</date> <title>Skiing Self Portrait</title> <desc>I was inspired by ML's self-portrait while </desc> <thumbnail>http://www.blipfoto.com/thumbs/5371/2009/big/color/36547696749a2c5782308e0.91477014.jpeg</thumbnail> </item> </output> Here's what my imported XML looks like with the InDesign Structure

  Read the article

• Indesign Import XML into Automatic Page generation, data merge

  - by taudep

  I've created some InDesign Pages that I want to use as templates. I've created an XML file with all the appropriate data. I want to merge the XML data with the InDesign page and have a few hundred pages automatically generated. I've been reading online and working with InDesign's "Import XML" features without any luck. The documentation has been pretty poor for me. And Google searches haven't returned much fruitful. Here are my present steps: I create a Master Page of my template I add a bunch of text frames where I want the imported data from the XML file to be places I open the "Tags" window and Import and XML file I mark my text frames in the Master Document with the appropriate tags I then add a lot of pages (like 200) to the document Then I use "Import XML" to try and get the data brought in and filled across all 200 pages. This is where I fail. There's something I'm missing. It might be that InDesign doesn't work as I'm expecting... Does anyone have any good tips for mail-merge like functionality with an XML document and auto-generation of InDesign pages? By the way, here's an example of Adobe's great documentation for merging repeated XML elements. There's got to be more... InDesign CS4 Docs: XML-Importing XML-Working with Repeating Data Here's some of the sample XML, notice the ITEM will repeat. I've also truncated the data in the "desc" tag: <output> <item> <user_name>taude</user_name> <date>2009-02-21</date> <title>Wishful Thinking</title> <desc>Skiing up in Vermont on a beautiful day. This photo of</desc> <thumbnail>http://www.blipfoto.com/thumbs/5371/2009/big/color/96104200949a162672e1996.15963073.jpeg</thumbnail> </item> <item> <user_name>taude</user_name> <date>2009-02-22</date> <title>Skiing Self Portrait</title> <desc>I was inspired by ML's self-portrait while </desc> <thumbnail>http://www.blipfoto.com/thumbs/5371/2009/big/color/36547696749a2c5782308e0.91477014.jpeg</thumbnail> </item> </output> Here's what my imported XML looks like with the InDesign Structure:

  Read the article

• Bazaar merge identical files

  - by Kristopher Ives

  I have two Bazaar (bzr) repositories that have very similar content. I'm trying to identify the differences and incrementally synchronize. My current strategy is to bzr add files to both repos and then use bzr merge to identify and resolve conflicts. The problem is that even if the file contents are identical it creates a conflict and a .moved file. What can I do to stop these conflicts or use a better workflow?

  Read the article

• Merge LVM Partition with unallocated Space

  - by David

  I have a linux hard drive with three areas: /dev/hda1 - ext3 boot partition (20 MB) /dev/hda2 - lvm2 main partition (6 GB) unpartitioned space - 12 GB I would like to merge the unpartitioned space into the lvm2 partition known as /dev/hda2. I tried using GParted, but it does not support lvm2. What commands or utilities could I use to add the unpartitioned space to hda2 without losing my existing data?

  Read the article

• Licensing for SQL Server Merge Replication via Web Syncronization

  - by user43330

  I am planning to implement a Sales force automation software where there will be 50 PDA devices having sql server CE 3.5 connecting via web sync merge replication to central SQL Server 2005 main Database via a IIS server. 1) IIS Server Win 2003 Server 2) SQL Server 2005 Standard 3) SQL CE 3.5 having in 50 PDA Devices. How many licenses are required for each Servers ? What is the licencing model

  Read the article

• Merge two Skype chat archive

  - by hvtuananh

  I have two computer, both of them are Windows XP SP3 32-bit and running the same version of Skype and login with the same account How can I merge 2 chat history of this two account into one and continue using this account with all of my chat history? EDIT: I don't want to export my chat for archive

  Read the article

< Previous Page | 9 10 11 12 13 14 15 16 17 18 19 20  | Next Page >