branch

git commit to all branches

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: If I fixed a bug in a file in branch branch_a , which should be applied to all branches. Is there a way to apply the change to all branches without having to checkout the branches individually. git commit -m 'commit msg' # on branch a git checkout branch_b git cherry-pick branch_a git checkout branch_c git cherry-pick branch_a What i would like to have is a git commit --to-all-branches which tries to propagate the changes to all branches if possible. Edit To clarify a bit my situation, I write code to for computational problems. Often I end

What does `rep ret` mean?

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I was testing some code on Visual Studio 2008 and noticed security_cookie . I can understand the point of it, but I don't understand what the purpose of this instruction is. rep ret /* REP to avoid AMD branch prediction penalty */ Of course I can understand the comment :) but what is this prefix exaclty doing in context with the ret and what happens if ecx is != 0? Apparently the loop count from ecx is ignored when I debug it, which is to be expected. The code where I found this was here (injected by the compiler for security): void _

Is it possible to trigger Jenkins from one specific branch only?

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: My situation is the following: I have three branches in a repo: master, dev and staging. And I have one job for each one of these branches, configured in 'Branches to build' section in Jenkins. origin/master, origin/dev, origin/staging. Bitbucket triggers the job to build whenever there are changes to the repository via a repository hook .( https://confluence.atlassian.com/display/BITBUCKET/Jenkins+hook+management ). However, when I push to master, all jobs starts to build, and the same with the other two ones. I want Jenkins

Subversion can't merge after a move

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I'm very new to Subversion, but I've used other revision control systems like ClearCase for years. My boss asked me to fix this project so that it could be built with Maven instead of Ant. One of the important things I had to do to was to move src/com to src/main/java/com , and move test/com to src/test/java/com , which I did using the svn mv command. I foolishly assumed that since I used Subversion commands to move the directories, that Subversion would then know that things had been moved. And when I merged my branch into the trunk, it

git: Your branch and 'origin/master' have diverged - how to throw away local commits?

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: I have the following message in git: # Your branch and 'origin/master' have diverged, # and have 3 and 8 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) I would like to throw away the 3 local commits, and pull the 8 remote commits at origin/master. (Merging is going to be too difficult, I'd rather make the 3 local commits again once master is up to date.) How can I do this? 回答1: git fetch origin git reset -- hard origin / master 回答2: To preserve your old commits on a temporary branch

Git warning: push.default is unset; its implicit value is changing

匿名 (未验证) 提交于 2019-12-03 01:12:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: When I push to remote in Git, I get this warning: warning: push.default is unset; its implicit value is changing in Git 2.0 from 'matching' to 'simple'. To squelch this message and maintain the current behavior after the default changes, use: git config --global push.default matching To squelch this message and adopt the new behavior now, use: git config --global push.default simple See 'git help config' and search for 'push.default' for further information. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode 'current'

How to only push to one branch in Hg?

流过昼夜 提交于 2019-12-03 01:11:07
问题 I have a Hg repo with 3 branches in it, but two of them are inactive (since I have already merged them into my default branch). hg heads shows 3 heads, one for each branch, even though hg branches shows 2 of those branches as 'inactive'. When I try to push my default branch (using hg push --branch default http://... ) to another repo, the merge is aborted with the message "abort: push creates new remote branches: !" From the Hg push man pages, "By default, push will not allow creation of new

Jenkins build fail for PR from GitHub

匿名 (未验证) 提交于 2019-12-03 01:10:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I'm using jenkins pipeline to build my github project. When I raise a pull request (PR) on GitHub, its creating a job "pr-head" which fails all the time with below error Let me know if you have any suggestions for this Even the answers in Git PullRequest job failed. Couldn't find any revision to build. Verify the repository and branch configuration for this job did not solve my problem 回答1: There is an open ticket about this: https://issues.jenkins-ci.org/browse/JENKINS-52668?filter=18657 EDIT: I was able to reproduce this issue using a

Reintegrate a branch vs merge a range of revision

匿名 (未验证) 提交于 2019-12-03 01:10:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: In subversion I made a branch now I want to merge it back into trunk. Which option should I use? Reintegrate a branch or merge a range of revision I was using Merge a range of revisions, but I was getting all sorts of tree conflict errors. Any idea what the difference is between these two? 回答1: When working with a branch, you should periodically merge ranges of revisions from the trunk into the branch to keep the branch in sync . if you don't pass any version numbers to svn merge and your svn server version is 1.5 or newer, it will track the

Applying the changes from branch b to a, without merging or adding commits

限于喜欢 提交于 2019-12-03 01:09:56
问题 My scenario is that I have one branch in which I've made big improvements to the build process (branch A) and in another I'm working on a unrelated feature (branch B). So now when I'm hacking away at branch B, I want to pull in the stuff I wrote in branch A because I want faster and easier builds. However, I don't want to "pollute" my branch B, just add changes from branchA to unstaged changes. What I've tried (when standing on branchB): git merge --no-commit branchA Doesn't work because it