branch

Jenkins Multibranch Pipelines - Configuring properties in branches?

此生再无相见时 提交于 2019-12-06 10:27:37
We have successfully set up a build pipeline using the Jenkins Multibranch Pipeline Plugin, which works great most of the time, but we have this problem which nags us: The Jenkinsfile contains a set of properties, and these also show up in the UI, but how can I set up default values for individual branches? This is how the properties definitions look like in our Jenkinsfile : properties([ parameters([ string(defaultValue: 'somevalue', description: 'Some description', name: 'SOME_VALUE'), string(defaultValue: 'asdfasdfasdfasdfdasdasdasdasd...', description: 'Client ID', name: 'TEST_CLIENT_ID'),

git分支

戏子无情 提交于 2019-12-06 10:02:42
新建一个分支 git branch newBranch 检查分支是否创建成功 git branch 切换到新建的分支 git checkout newBranch 将改动提交到新分支 git add . git commit -m "the new branch" 然后 git status 检查是否提交新分支成功 切回到主分支 git merge newBranch 然后就可以push代码到远端仓库 git push -u origin master 删除新分支 git branch -D newBranch 来源: https://www.cnblogs.com/chenguifeng/p/11975829.html

Github delete branch even after made commits to it?

风流意气都作罢 提交于 2019-12-06 09:57:05
问题 I have a github repo and I am working on the site, I don't know how to do command line stuff. So I have a branch I made commits too. And I see it can be deleted. This is kind of nice. I always do small unit tests and just want to delete it. So if I do delete a branch is all traces and history of it gone? 回答1: If you don't have a local repo anymore (meaning you cannot get your deleted branch through the local git reflog and push it back to GitHub), you still can retrieve (for a limited time,

'Forgetting' a dead-end branch

走远了吗. 提交于 2019-12-06 09:55:04
I've got a mercurial repository. It was on rev A. I made some changes, committed (to rev B), and pushed. However, later, I realised I didn't want to make those changes. I updated back to rev A, and made some alternative changes, to rev C. C | - | B |/ A However, now I can't push rev C, because it complains that it would create a new remote head (which it would). How do I make the remote mercurial simply forget about rev B and all the changes therein, so I can push rev C and carry on from there? Personally I'd close the branch and force the push (as Tim Henigan describes), as it leaves the DAG

Servicing Branch in Standard Branch Plan

◇◆丶佛笑我妖孽 提交于 2019-12-06 09:13:49
问题 I have a very simple question regarding the Standard Branch Plan. I understand branching, FI and RI, etc. What I don't quite understand is how to use the Servicing branch in practice. My understanding is when it comes time to release, I branch Main -> R1.SP1 (assuming this is my first release, for example) and then immediately branch R1.SP1 to R1. Then set R1 to Read Only. This I completely understand and like. Here's what I don't understand: How and when do R1.SP1, R1.SP2, R1.SP3 get created

Git branching - pull request on HEAD branch takes also prior branch commits

好久不见. 提交于 2019-12-06 09:12:07
I come from IBM RTC, so I need to get used to Git. I have forked a repository, done a couple commits on my master branch and opened a pull request. Pull request: original-repository/master <- my-repository/master commit-1 commit-2 I then created a new branch and pushed a change. I opened another pull request starting from the new branch, and that's what I find. Pull request: original-repository/master <- my-repository/newbranch commit-1 commit-2 commit-3 What if I want to have a pull request with only commit-3 ? I'm really surprised it's not a duplicate... It turns out I already answered

Git --05 Gitlab使用

对着背影说爱祢 提交于 2019-12-06 08:09:43
目录 Gitlab使用 01. 外观配置 02. Gitlab汉化配置 03. 注册限制 04. 创建用户及组 05. 创建用户 06. 把用户添加到组 07. 创建项目 08. 推送代码到Gitlab 09. 开发推送代码到Gitlab 10. 分支保护 11. 代码合并 Gitlab使用 01. 外观配置 02. Gitlab汉化配置 1、下载汉化补丁 git clone https://gitlab.com/xhang/gitlab.git 2、查看全部分支版本 git branch -a 3、对比版本、生成补丁包 git diff remotes/origin/10-2-stable remotes/origin/10-2-stable-zh > ../10.2.2-zh.diff 4、停止服务器 gitlab-ctl stop 5、打补丁 patch -d /opt/gitlab/embedded/service/gitlab-rails -p1 < /tmp/10.2.2-zh.diff 6、启动和重新配置 gitlab-ctl start gitlab-ctl reconfigure 03. 注册限制 04. 创建用户及组 05. 创建用户 06. 把用户添加到组 07. 创建项目 返回首页,进入项目 #删除github的仓库 [root@git ~/git_data

Deleting git branch loses audit

走远了吗. 提交于 2019-12-06 07:36:37
If a branch has been deleted in git is it still possible to identify whether specific commits were made on that deleted branch? From what I have found so far - git branches are merely pointers so deleting them would lose the that specific part of the audit history. Hoping that I can be proven wrong on this. thanks, git branches are merely pointers Yes and which is exactly why deleting them would delete just the pointer. If you have merged the branch to your mainline, you no longer need that pointer; but you will always know what all commits were made to that branch individually, unless you

git - 高级

谁说胖子不能爱 提交于 2019-12-06 07:03:54
常用命令 创建分支 - git branch 单纯的使用 git branch 命令会显示当前的分支名称,使用 git branch feature1 创建了一个名为 feature1 的分支,git checkout feature1 表示切换到 feature1 分支,git checkout -b feature2 则是上述两个命令的结合,创建并切换到 feature2 分支。 $ git branch # 查看 * master $ git branch feature1 # 创建 $ git branch * master feature1 $ git checkout feature1 # 变更 Switched to branch 'feature1' $ git checkout -b feature2 # 创建 + 变更 Switched to a new branch 'feature2' 删除分支 - git branch -d 合并分支 - git merge $ git branch * feature2 feature1 master $ git merge feature1 # 此时需要填写 merge 信息,然后就成功将 feature1 的内容合并到 feature2 中 $ git branch -d feature1 # 此时 feature1

Determine whether two Git branches have diverged

此生再无相见时 提交于 2019-12-06 07:01:57
问题 I'd like to determine whether two Git branches have diverged or whether one of the branches could simply be fast forwarded to the other branch. In other words, I want to check whether the current HEAD of one of the branches has been merged into the other branch at some point or if it contains commits that are not in the other branch. Is there a way to do this without actually merging the two branches? A simple git diff does not help in this case. 回答1: I'm using this shell script snippet for