pull-request

resolve git conflicts for particular files by automatic merge all changes

由 自作多情 提交于 2019-12-11 02:25:43
问题 There is a project using github repositories. When there are conflicts to be resoled before merging pull request some 90% of conflict cases concern just one CHANGELOG file containing list of completed tickets, sth like: ## current <<<<<<< HEAD ISSUE-128 done some 128 ISSUE-131 done some 131 ======= ISSUE-125 done some 125 >>>>>>> ISSUE-125 ISSUE-126 done some 126 ISSUE-120 done some 126 ISSUE-123 done some 126 I wonder if there is a way to automate merge of this particular file (possibly by

Pull requests overriding earlier commits

由 。_饼干妹妹 提交于 2019-12-10 18:32:55
问题 I am new to Git so bear with me. I have a Git repository (on GitHub) and I have lots of coders who are inexperienced with Git. When I hire them, I ask them to make a pull request towards my repository so I can review their changes before I merge. At the moment my biggest problem is that often I merge changes into my repository after they fork it, but before they make their pull request, meaning that merging their pull request overrides an earlier commit. Is there a way for me to ensure that

stash Pull Request Builder Plugin

由 时光总嘲笑我的痴心妄想 提交于 2019-12-10 15:56:42
问题 Has any one used stash builder plugin.Its documentation says that it adds some environment variables in to the build environment but if i echo them,they all are empty echo "${sourceBranch}" echo "${targetBranch}" echo "${sourceRepositoryOwner}" echo "${sourceRepositoryName}" echo "${pullRequestId}" echo "${destinationRepositoryOwner}" echo "${destinationReposotryName}" echo "${pullRequestTitle}" echo "${sourceCommitHash}" This plugin is doing nothing for me.Here is my configuration I am

Why cannot git reset to pull request

由 南笙酒味 提交于 2019-12-08 19:52:33
Sometimes I log onto a cloud instance, pull a repo, and then want to try a pull request. The command I use now is git fetch origin pull/<ID>/head && git checkout FETCH_HEAD which is long. I also tried shorter ways git reset --hard origin/pull/<ID> git reset --hard origin/pull/<ID>/head git reset --hard origin/pull/<ID>/HEAD which give the following error $ git reset --hard origin/pull/27 fatal: ambiguous argument 'origin/pull/27': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' Why does git

Pull Request, ignore some file changes

由 我的梦境 提交于 2019-12-08 14:30:22
问题 When I do a Pull Request on GitHub (against master branch), can we ignore some file changes, like we have one file named 'fileA' in branch 'release', and we have the same file in 'master', but we do some changes in 'fileA' in branch 'release' when we do a Pull Request, is there any way we can ignore the changes in 'fileA', do not let that merge into 'master'. 回答1: You can't ignore some files from a pull request selectively. Two workarounds for this can be - First - Create a new branch from

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

由 落爺英雄遲暮 提交于 2019-12-07 23:02:08
问题 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

What do I do when a pull request is cherry picked?

由 筅森魡賤 提交于 2019-12-07 17:24:57
问题 I forked a project on GitHub, pushed some changes, and opened a pull request. The maintainer signed-off and applied the changes in a new commit (rather than merging my commit), and so the commit graph looked like this: * 03a0687 (origin/master) frotz: Corrected MAN_PREFIX | * 11d3e98 (HEAD, master, jleedev/master) frotz: Corrected MAN_PREFIX |/ * 9c3dd1a yajl: use direct patch from Github. Obviously, I have to either rebase or force-update my local branch. Do I then have to force-push to my

How do I merge a pull request into a feature branch of my github project?

由 瘦欲@ 提交于 2019-12-07 08:58:53
问题 Someone has submitted a pull request to my GitHub project from a fork. Rather than merging directly into master, I would prefer to merge the changes into a feature branch so that I can make some minor edits before merging the final product into master. If at all possible, I'd like GitHub to indicate to the submitter that the request was accepted (I want to encourage and recognize contributions!). Is this possible? How do I go about it? 回答1: It would be nice if you could change the merge

TFS Git - pull requests 'Merge failed'

由 丶灬走出姿态 提交于 2019-12-07 08:38:58
问题 Hi I have this problem with TFS and git pull requests. We have two main branches: -master -develop So I create new branch async_data_loading from develop and do some changes in it. Next I commit and push my changes to remote async_data_loading and then I create new pull request to merge my changes into remote develop and I get this: But when I try to find any merge conflicts from console there is none to fix...I can even merge my changes to my local develop without any problems. As you can

Github API - find out who closed a pull request [closed]

由 半城伤御伤魂 提交于 2019-12-07 08:30:55
问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 2 years ago . How do I find out who closed a pull request using the Github API? e.g. this pull request was opened by myakura, closed by markdotto. But https://api.github.com/repos/twitter/bootstrap/pulls/4461 doesn't show any reference to markdotto. 来源： https://stackoverflow.com/questions/12033171/github-api-find-out-who
订阅 pull-request