branching-and-merging

merge /discard reports 'No Pending Changes' when /candidate shows them

由 拜拜、爱过 提交于 2019-12-07 08:35:32
问题 I'm trying to run a merge /discard command ( tfs merge /discard /version:nnn:yyy $/sourceproj $/targetproj /recursive ) but it says there are no pending changes. If I run a tfs merge /candidate $/sourceproj $/targetproj it shows the relevant changesets as candidates. any ideas why this happens and how to get round it? Thanks. 回答1: If you know the exact changeset number try: tf merge /discard /version:C111~C111 BranchX BranchY /recursive This assumes you know the changeset number (in this case

Mercurial merge repository as branch

由 谁说胖子不能爱 提交于 2019-12-07 08:08:45
问题 I have two Mercurial repositories that are for different major revisions of the same project. The latter version is a massive change to the functionality, and especially the UI, of the project, but it will still have a lot of common code with the earlier version. (For shorthand I'll call these versions 4.6 and 5.0 and the repositories project-4.x and project-5.x going forward; that's basically what I'm dealing with.)[1] As we thought more carefully about the structure of our repository, and

Git pull gives conflicts with octopus strategy

由 浪尽此生 提交于 2019-12-07 07:56:39
问题 Lately when I run git pull in my master branch it occasionally gives the following merge error: Trying simple merge with 7ff9b5... Trying simple merge with 6872cd... Simple merge did not work, trying automatic merge. Auto-merging file.txt ERROR: content conflict in file.txt fatal: merge program failed Automated merge did not work. Should not be doing an Octopus. Merge with strategy octopus failed. However after this merge attempt there are files that aren't even in the master branch. I can

Merge/rebase a 'disconnected' branch in Git

由 五迷三道 提交于 2019-12-07 06:01:07
问题 Suppose we have the following situation in Git: X---Y feature / A---B---C---D edge Now I rebase the edge branch changing the B commit a little bit (using edit ) so it now looks like this: X---Y feature A---E---C'---D' edge C' and D' are the same commits as C and D, but applied on top of E (and notice that X within the feature branch became disconnected). Now how can I: Rebase/merge the feature branch so that its commits appear as if they were applied on top of D'? Rebase/merge the feature

Switch the svn branch git dcommits to

由 陌路散爱 提交于 2019-12-07 02:54:12
问题 I had master dcommit to (and rebase from) the Subversion trunk . I created an intermediate Subversion branch tc , to merge changes from 2 different branches, using: git branch master git svn branch tc -m "Branch for merging" git checkout -b tcl --track tc git merge cat #Another branch, whose changes I merged here git commit -m 'Merged changes from cat branch' git svn dcommit Since everything was fine, I wanted to promote this to the trunk . I followed doing: git branch master git merge tcl

How can QA test multiple features at once with feature branching in Gitflow workflow?

由 你。 提交于 2019-12-06 12:49:07
问题 If developers were to work on different branches for different features I understand that they can give a QA build from the feature branch and once it is tested it can be merged with "develop". But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? 回答1: But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are

Git won't let me merge

由 与世无争的帅哥 提交于 2019-12-06 06:11:20
问题 Good evening! I know this is very usual and there are probably thousands of answers on the internet but I couldn't find one that was helfull. I have two local branches: MASTER Mk I made a lot of changes to Mk, committed these, and switched to MASTER to merge these two branches. But there were conflicts. So now I am on the MASTER branch, can not switch to Mk anymore, but need to override my MASTER with Mk. It keeps saying error: Your local changes to the following files would be overwritten by

svn copy command

由 北城余情 提交于 2019-12-06 02:36:07
I understand that this a very noob problem, but when I try to create a new branch from already present branch (not trunk) with the command : svn copy svn+ssh://svn.example.com/software/branches/branch_name svn+ssh://svn.example.com/software/branches/new_branch_name -m "Message" I get the following error : svn: No repository found in 'svn+ssh://svn.example.com/software/branches' I have checked again and again, the directory is correct. I don't understand why this is happening. Ahh finally figured out the mistake... the command should have been :- svn copy svn+ssh://user@svn.example.com/software

Script to merge 2 git branches automatically?

由 余生颓废 提交于 2019-12-05 20:47:49
问题 My git repository has 2 branches: master and develop. I want a script that merges all changes from develop to master automatically. I used Jenkins: The Git plugin clones the repository and then this script (the 'version' variable is a job parameter) is run: # merge git checkout -b develop origin/develop git checkout master git merge -Xtheirs --squash develop -m "v${version}" # commit git commit -m "v${version}" # tag git tag v${version} -m "v${version}" # push git push origin v${version} I

Git pull gives conflicts with octopus strategy

由 让人想犯罪 __ 提交于 2019-12-05 16:18:11
Lately when I run git pull in my master branch it occasionally gives the following merge error: Trying simple merge with 7ff9b5... Trying simple merge with 6872cd... Simple merge did not work, trying automatic merge. Auto-merging file.txt ERROR: content conflict in file.txt fatal: merge program failed Automated merge did not work. Should not be doing an Octopus. Merge with strategy octopus failed. However after this merge attempt there are files that aren't even in the master branch. I can fix this issue using git reset and pulling again but I was wondering where this head or commits where
订阅 branching-and-merging