branch

TFS 2012 Unshelve to different branch -> An item with the same key has already been added

匿名 (未验证) 提交于 2019-12-03 00:56:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I need help resolving the following issue: I am attempting to unshelve code from the source branch onto a target branch. I am using the following: VS2012 RC TFS 2012 VS2012 x64 Cross Tools Command Prompt When I use the command prompt to perform the unshelve operation, the following occurs: Shelveset details dialog gets displayed with list of change files. Click Unshelve button. Observe command prompt output: "An item with the same key has already been added." I have downloaded ServicePack1 for power tools. However, I have failed to

git recover deleted file where no commit was made after the delete

匿名 (未验证) 提交于 2019-12-03 00:56:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I deleted some files. I did NOT commit yet. I want to reset my workspace to recover the files. I did a git checkout . . But the deleted files are still missing. And git status shows: # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # deleted: cc.properties # deleted: store/README # deleted: store/cc.properties # Why doesn't git checkout . reset the workspace to HEAD ? 回答1: The output tells you what you need to do. git reset HEAD cc.properties etc. This will unstage the rm operation. After that, running

git diff between remote and local repo

匿名 (未验证) 提交于 2019-12-03 00:56:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: Trying to diff my local file with a GitHub repo before I submit a pull request so I can see what will show up, is there an accurate way of doing this? I assume GitHub's compare tool manipulates Git's diff ? 回答1: Don't do a pull : do a fetch (the syntax is the same as git pull , but it doesn't automatically merge) do a diff between your dest branch and the other branch then do a merge if you want 回答2: To compare a local working directory against a remote branch, for example origin/master : git fetch origin master This tells git to

How do I squelch “fatal: The upstream branch of your current branch does not match the name of your current branch”?

匿名 (未验证) 提交于 2019-12-03 00:55:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: There is a related question on SO dealing with how to change the parameters of the push command to avoid this message: fatal: The upstream branch of your current branch does not match the name of your current branch I'm interested in how to squelch the message itself, without changing the names of my local/remote branches or using fancy push commands. Suppose I have a local branch tracking a remote branch of a different name: user@home:~ git branch -vv branch-name abcd1234 [remote/origin/branch-name] last commit message Now I want to be able

Jenkins Git plugin detached HEAD

匿名 (未验证) 提交于 2019-12-03 00:52:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I am new to Git and also to Jenkins. My problem is that I can't get the Jenkins Maven release plugin to work. When I build a common Maven build with Jenkins, it works well, but when I try to perform a release with the Maven release plugin, I get the following stack trace: org . apache . maven . lifecycle . LifecycleExecutionException : Failed to execute goal org . apache . maven . plugins : maven - release - plugin : 2.3 . 2 : prepare ( default - cli ) on project parent : An error is occurred in the checkin process : Exception

vector::push_back insists on using copy constructor though a move constructor is provided

匿名 (未验证) 提交于 2019-12-03 00:52:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I was receiving a strange error from gcc and cannot figure out why. I made the following example code to make the problem more clear. Basically, there is a class defined, for which I make its copy constructor and copy assignment operator private, to prevent calling them accidentally. #include #include using std::vector; class branch { public: int th; private: branch( const branch& other ); const branch& operator=( const branch& other ); public: branch() : th(0) {} branch( branch&& other ) { printf( "called! other.th=%d\n", other.th ); }

Git clone: “You appear to have cloned an empty repository”

匿名 (未验证) 提交于 2019-12-03 00:50:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Some colleagues and I have been working on a project stored in a private git repository. Historically, there have been no problems, but recently I attempted to clone, and got the following problem: Cloning into 'project'... warning: You appear to have cloned an empty repository. Checking connectivity... done. A git log provides: fatal: your current branch 'master' does not have any commits yet This isn't correct - my colleague pushed plenty of (nonempty) changes on Dec. 6 (although now that branch isn't showing on a --single-branch clone

git-svn clone fails “fatal: Not a valid object name”

匿名 (未验证) 提交于 2019-12-03 00:50:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Whilst doing git svn clone -s https://svn.example.com/repo/ I received the following output: r3073 = a6132f3a937b632015e66d694250da9f606b8333 (refs/remotes/trunk) Found possible branch point: https://svn.example.com/repo/trunk => https://svn.example.com/repo/branches/v1.3, 3073 W: Refspec glob conflict (ref: refs/remotes/trunk): expected path: repo/branches/trunk real path: repo/trunk Continuing ahead with repo/trunk W: Refspec glob conflict (ref: refs/remotes/trunk): expected path: repo/branches/trunk real path: repo/trunk Continuing ahead

git says “The following untracked working tree files would be overwritten by checkout” when switching branches

匿名 (未验证) 提交于 2019-12-03 00:46:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I have a branch called " develop " in remote bare repo " hub " and I have a checkout copy of the develop branch in my local git repository (user poomalai ). I have deleted (git rm --cached) a file (Mydirectory/myfile.php) from another checkout copy (user raj ) and pushed to the hub repository. Now when I pull the changes from the hub to "poomalai" it worked fine and I got the commit message of file deletion in the git log. I have added the file in the .gitignore file in the user poomalai. Now I have created the file in my local repo (user

Git: How to create a new branch from a tag?

匿名 (未验证) 提交于 2019-12-03 00:46:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Something happened and our master branch got all screwed up. Rather than spending the time trying to figure out what went wrong, I just want to create a new master branch from an existing tag. So if my tag is v1.0 , how do I create a new branch from this tag? 回答1: Wow, that was easier than I thought: git checkout -b newbranch v1.0 回答2: git branch newbranch v1.0 The above command will just create the new branch, not check it out. 回答3: I have resolve the problem as below 1. Get the tag from your branch 2. Write below command Example: git