pull-request

Conditionally add a tag to merge-commit using Azure DevOps and git

雨燕双飞 提交于 2021-02-11 12:53:26
问题 I would like to basically achive the very same thing you could achive while using the built in "tag-functionality" for build in Azure DevOps, with one exception.. I need to add a tag conditionally.. The basic idea is to evanluate if the SourceBranch for my PR starts with refs/heads/hotfix, and that the target branch is refs/heads/master, then I would like to tag the final merged commit with the tag "hotfix". I started with something like this: name: PR-$(Rev:r) trigger: none pool: vmImage:

How to do a Git pull request on remote branches via the command line

元气小坏坏 提交于 2021-02-11 12:11:15
问题 I have a feeling i'm using the wrong words, or misunderstanding the words i'm using, which is making searching for what I want to do difficult. Right now I have a Git repo with 3 branches hosted on Azure Devops (very similar to Github/Gitlab/Bitbucket etc). My current flow is to commit and push locally (using PHP Storm) and then login to Azure Devops and manually use their UI to do a pull request from my develop branch to my staging branch. Then I log into the server and git pull from the

How to do a Git pull request on remote branches via the command line

 ̄綄美尐妖づ 提交于 2021-02-11 12:11:04
问题 I have a feeling i'm using the wrong words, or misunderstanding the words i'm using, which is making searching for what I want to do difficult. Right now I have a Git repo with 3 branches hosted on Azure Devops (very similar to Github/Gitlab/Bitbucket etc). My current flow is to commit and push locally (using PHP Storm) and then login to Azure Devops and manually use their UI to do a pull request from my develop branch to my staging branch. Then I log into the server and git pull from the

Linking pull requests to the workitems from the TFS database

回眸只為那壹抹淺笑 提交于 2021-02-10 16:47:16
问题 We use custom queries (against TFS databases: Tfs_DefaultCollection and Tfs_Warehouse) to check if all changesets have a workitem linked to it. We use the FactWorkItemChangeset table from the Tfs_Warehouse database. Currently we are migrating to TFS Git and we want to update our custom queries to check if all the pull requests have a workitem linked to it. For example: Git pull request and its workitem We don't know where in the Tfs_Warehouse or in the Tfs_Defaultcollection database the pull

Enforce up-to-date pull requests on GitHub

旧城冷巷雨未停 提交于 2021-02-10 14:41:04
问题 Our team has a master branch on GitHub and several other feature branches that eventually need to be merged back to master. What should one do to ensure that the feature branch is up to date, before a Pull Request is created on GitHub? Is there a sort of lock that we can implement on the master branch to enforce up-to-date feature branches before Pull Requests can be created? 回答1: GitHub's branch protection can require branches to be up to date before they're merged , but not before they're

Enforce up-to-date pull requests on GitHub

女生的网名这么多〃 提交于 2021-02-10 14:40:24
问题 Our team has a master branch on GitHub and several other feature branches that eventually need to be merged back to master. What should one do to ensure that the feature branch is up to date, before a Pull Request is created on GitHub? Is there a sort of lock that we can implement on the master branch to enforce up-to-date feature branches before Pull Requests can be created? 回答1: GitHub's branch protection can require branches to be up to date before they're merged , but not before they're

Github - merging commits pull requests to several branches

筅森魡賤 提交于 2021-02-08 08:27:42
问题 We added a flow of mandatory pull requests when pushing code to our 3 main branches - dev, releaseCandidtae and production. the flow is: dev -> feature-branch -> pull request and merge back to dev merge\cherry pick to releaseCandiadte branch merge\cherry pick to production branch Sometimes the feature branch is a fix and go out from production branch and cherry picked back to dev. I understand that the code base might be different but is there a way to merge a commit to a all branches with

Should I rebase with dev branch before making a pull request?

旧街凉风 提交于 2021-02-07 12:21:58
问题 Our current workflow: create a feature branch from dev. after developing the feature and having pushed the branch do a the following: git checkout dev git pull --rebase (on dev) git checkout my-feature-branch git rebase dev resolve conflicts and then do a git push -f or git push (first time). My question comes from one of our development team members: Do we need to do the whole process as is, or can we just make the pull-request directly, especially that the response is always "I am working

Should I rebase with dev branch before making a pull request?

你。 提交于 2021-02-07 12:20:58
问题 Our current workflow: create a feature branch from dev. after developing the feature and having pushed the branch do a the following: git checkout dev git pull --rebase (on dev) git checkout my-feature-branch git rebase dev resolve conflicts and then do a git push -f or git push (first time). My question comes from one of our development team members: Do we need to do the whole process as is, or can we just make the pull-request directly, especially that the response is always "I am working

Calculate lines of code change for a commit? [closed]

不羁的心 提交于 2021-02-05 12:23:17
问题 Closed . This question needs details or clarity. It is not currently accepting answers. Want to improve this question? Add details and clarify the problem by editing this post. Closed last month . Improve this question Is there a way to calculate lines of code in a Pull Request API in Azure Devops for each file. I have gone through below two links and but was not of much help. Is there a way to get the amount of lines changed in a Pull Request via the Dev Ops Service REST API? Lines of Code