Hi, How to disable auto-merging in GIT? The purpose is to have the same behaviour as for conflict merges resolution in automatic merges during invocation of command chain: $ git fetch $ git merge some_branch $ git mergetool The last command leads us to 3-way merge of files in case of merge conflicts. I would like to have an easy way...
Hi, having a weird problem with TFS (TFS2008). We've done a merge into our Main trunk. We've resolved the conflicts and we've checked in associating it with a single work item. So we have our WorkItem with a single changeset in it. Our build is failing because the previous version of the csproj file is being got from TFS. If I open th...
Currently I know of two methods of embedding assemblies into one application file: ILMerge and using the ResolveAssembly event. I would like to know if anyone have had more success with one over the other. Is there any drawbacks from using either one of those (performance, security, ...)? From my point of view, it looks like we should...
I have moved from subversion to tfs for version control, and it is my understanding that you cannot merge discontinuous change-sets in tfs. For example, say I have a file baseline.txt that looks like this: line one Then, I branch the file to a new file called branch.txt, and then do two check-ins on baseline.txt so that it finally l...
Hi, I am running in an issue similar to the one in this other thread and I'm getting short of ideas so I would really appreciate any help ! Here's the thing : We have an ASP application that uses session variables and has to deal with session merging due to multitabs (IE8). After many many many tries, I've came to the following impl...
I have a SVN repository for a piece of software developed by a third party. My repository has the following three directories: trunk oldVersion newVersion I'm trying to use the following svn command to upgrade from version 1 to 2: svn merge oldVersion@HEAD newVersion@HEAD . --ignore-ancestry where the working directory contains a c...
Is Mercurial always using the external merge tools when two branches that are merging have changes to the same file? Or does it first see if it can merge the file itself, and only punting to the external tool if it can't? The reason I'm asking is that I am (once again) re-reading the tutorial written by Joel Spolsky on Mercurial and on...
I've been working on a feature in an SVN branch for a while. Periodically, I merged changes from trunk into my private branch so I could get everyone else's changes using the procedure described here. That seemed to work fine. Now I'm ready to merge my changes into trunk. I'm trying to do this by merging the range of revisions starting ...
I'm using git rerere, and it is useful, but there is one problem: When it automatically resolves a file, it does not mark it as resolved (eg with git add). So if I run 'git mergetool', it opens up the file as if it still has all the conflicts in it. So far, I've made a small shell script which I can call, which scans all files marked a...
Say I have revision A that's from a long time ago and made a desirable change. Then, later on, I had revision B which made lots of changes to lots of files, including wiping out change A. Now, much later, I want to re-apply revision A. Is there a good way to do this? The merge and cherry-pick commands seem to skip revisions that are ...
I am trying to merge a Branch to Trunk using the TSVN 'Reintegrate a branch' feature. However I get the following error. Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'? What is the reason for this error? Also is there some other way to merge the Branch to the Trunk. ...
I joined a team with greenfield code. When I joined, they did not have a common repository, and they emailed me a tarball of his latest. (yeah, I know...) I've been working off that tarball, making changes and adding files. Now the team has a Mercurial repository (hooray!), and it's been populated with the same code containing more recen...
My company is switching to Mercurial, and we're coming from Subversion. We're noticing that we're having to do a LOT of merging in our workflow. For instance, if I change a file, commit, pull, update, push, and then my co-worker changes a file, commits, pulls, and updates, he gets a "crosses branches" error and has to do an hg merge. We...
There are several/many questions regarding TFS branching strategy, but I am haven't been able to come up with a strategy that fits with my scenario. My TFS project consists of a single solution that contains a Web Project, a Business Layer Project, and a Data Layer Project. The project is a portal of reports. Reports are largely isola...
i have an open source ruby project on github, where my master branch represents what has been released, and my dev branch represents what will be released next. the master branch is ~ 80+ commits behind the dev branch, and the dev branch contains fairly significant architectural changes. a contributor has sent me a pull request for cha...
The recommended practice of using --reintegrate is generally understood by me. However, the practice of reintegration recommends that the branch be deleted, and if needed for maintenance or warranty development, the branch should be "recreated." However, most examples show the recreation of the reintegrated and deleted branch under a ne...
I've got a (sparse) development branch in Perforce which I keep up to date regularly with the main code line. I'd like a simple way to list all the non-integration changes which have been made to the branch, ideally checked out into a new changelist (to allow me to do final code-tidyups before merging back to the main code line). The on...
I have a Windows application with access 2007 database which is deployed at 2 different locations - Sales office/Factory. Every day both the locations need to sync up the database so orders are propagated to the factory and order status/invoices/production updates are propagated to the sales office. The schema for both the db copies is i...
Could someone give me an explanation for these two switches? Are they mutually exclusive? Or -w includes -b? thanks ...
I found the following stuff from progit. I do not understand the portion in bold style. Could anyone kindly explain. The Git project has four long-running branches: master, next, and pu (proposed updates) for new work, and maint for maintenance backports. When new work is introduced by contributors, it’s collected into topic branches ...