Git: exclude committed file from pull request
The problem is you can not send pull-request with commit which removes .idea/workspace.xml because it's up to repository owner whether to merge that pull request or not. So you need to modify the same commit where you've added that file. To do that use git rebase --interactive Get SHA of...
Add commits to a pull request as a repo's owner
Generate a branch (a merge test branch) starting with master. Either merge each commit in turn and use git commit --amend, or go through them in turn with git rebase -i, choosing the e option. If you want to reset the author, add --reset-author. In the comments the author says...
How to auto merge pull request on github?
You can most probably add an after_success action to your .travis.yml that would merge the PR using GitHub API. I do not know of any ready to use script for this, but there is no reason for it to be hard. Special care needed for authentication ......
github Diff Truncated error
git,github,git-branch,pull-request
It is possible the pull request triggers one of the limits mentioned by GitHub support. Brian Levin @github: We have some limits on diffs that we show in the browser in order to keep the pull request and compare pages working. Currently, we cut them off at: 300 files, a...
How to fix whitespace before pull request?
git,whitespace,indentation,pull-request
I'm afraid there cannot be a general solution. Either tell your editor not to touch formatting or tell your editor to use the "correct" formatting If your editor is making arbitrary whitespace changes and especially line breakes (like eclipse with unsuitable formatting rules) you really cannot revert those changes in...
Raise a clean pull request in git
You were wrong on step 3, here you need to checkout from module1 branch and goto master branch. For more clearer description, which you can try on any bitbucket/github.com test repo, you can follow below steps to start from beginning or you can ignore steps which already done and check...
how to update git branch created from github pull request with more recent changes
The person who forked your repository (who I'll call the "forker") has a remote clone, and they are committing to their feature branch. The pull request is simply you fetching changes from their remote repository, and then merging them to your local branch. (Note: Since a git pull is the...
Github, in-code questions in a pull request
Imo, starting a pull-request on Github for asking particular questions about some code (lines, blocks, sections) is not the best practice: the repository gets polluted, as in order to start a PR you have to push at least some minor changes onto you repository code comments can get outdated, i.e....
updating github pull request
Long answer short: No. Not unless you have permission to edit that person's fork. You can, however, pull in the person's commits and work on top of them as shown below. Note that this will not modify the PR, but only enable you to keep the person's commits. You could...
Creating Multiple GitHub Pull Requests From a Fork
Yes create a new branch for each feature you add. It's good practice anyways as it allows you to work of different things simultaneously if you so choose. You can use a combination of git reset and git rebase -i to correct the changes. Possibly you might want to just...
Fork and Pull Method Not Working on GitHub
Seems like you haven't pushed your branch up to your fork repository, try doing: git push -u origin mybranch Here I'm assuming your remote is origin (as by default). If not, use your remote's name instead of origin. EDIT: I think there are some conditions (non fast-forward changes) in which...
Team Foundation Server 2013 trigger build for pull request
git,visual-studio-2013,tfsbuild,tfs2013,pull-request
You can use wildcards in the branch name. So if you create your pull request branches on the server with a naming pattern to them, such as "pr-myrequest", you can add that to the server's CI settings: There is a little blurb on this topic in the guidance on MSDN....
Mercurial : how to deal with rejected pull request?
mercurial,bitbucket,pull-request
It depends. If your fork is public or you want to keep the rejects, something like this workflow is probably ideal: Update to the tip and do hg ci --close-branch. Pull from the main repository if necessary. Update to the most recent changeset which belongs to the main repository, and...
Joomla Pull request failing - Travis CI build failed
git,joomla,composer-php,travis-ci,pull-request
I can very easily see that the PHPUnit call failed with 10 failures. Scroll down a bit to see the output at around line 814 of the shell dump. Travis CI never fails due to an outdated Composer version (but you could add a call of composer self-update to the...
Why reverted commit won't show in new PR?
git,github,git-commit,pull-request,git-revert
For those of you wondering: All I had to do was merge from master to XYZ branch so I could get the latest commits then revert the commit that reverted my code. Then the files in that previously reverted commits showed up in the new PR.
Github “Pull request” close issue does not work
git,github,commit,pull-request
Github member helped me to resolve this issue. If you try to close an issue by a git commit body message It will be a must to merge xxxx branch to master. If you try to merge to another branch feature wont work. This was my error. A lof thanks...
Github access rights for follow-up commits after successful pull request
Unless the owner of the original repo has given you write access (or made you a contributor), you will have to create another pull request. Update your fork from the upstream repo to get the merged changes, create a new branch from there, and make additional changes. Push your branch...
How to turn off fast-forwarding in Git?
git,deployment,bitbucket,pull-request
If you want to turn it off for a given branch: git config branch.master.mergeoptions "--no-ff" For any branch: git config merge.ff false (from git config man page) Those commands are to be executed within the repo where you want the merge to not be fast-forwarded (see "Why does git fast-forward...
Github - Pull Request, ignore some file changes
You can't ignore some files from a pull request selectively. Two workarounds for this can be - First - Create a new branch from 'release' Replace the non-required files from 'master' Create pull request from this new branch Second - Create a new branch from 'master' Put changes of required...
Git: I don't understand how a pull-request can possibly work like THIS
In http://git-scm.com/docs/git-request-pull the first push is pushing from your local computer (e.g., your laptop) that only you have any access to, to your personal repository on a sharing site. The sharing-site version allows other people to read it, but first you must write it there, with a push step. Once...
Neat, clean compacted git PR and merge commit, into one commit
git,github,commit,pull-request
Just found this workflow from the Meteor team (coincidentally, thanks @Emily): When you look at a pull request in the GitHub web interface, there's a very attractive "merge" button. NEVER USE THE MERGE BUTTON. It is an attractive nuisance. It leads to git history that's way more complicated than necessary:...
How can I remove a participant from a GitHub pull request?
People automatically become participants when they interact with the PR (or you interact on their behalf, in this case), and I don't think they can be removed. However, Brian can unsubscribe from notifications in the PR's sidebar, and then his participation is purely historical.
When to use forks and pull requests in GitHub
git,github,pull-request,git-fork
There's a rule: one repository should not be shared by two developers. This is why collaborators usually fork a parent repo and develop in their own fork. A fork is just a repository with a link to another parent repository. Collaborators can make a pull request from their fork to...
How the docker git repo is showing different tags in pull requests like status/need-review
github,tags,docker,pull-request
That is because GitHub proposes to add labels to pull requests (See GitHub help for pull requests) BitBucket, in its "Work with pull requests", does not mention (yet, May 2015) a similar feature. The OP rohit asks in the comments: do you have any idea how it actually happening automatically?...
Difference Between Bitbucket Service Hooks Post and Pull Request Post
git,post,bitbucket,pull-request
POST hook - posts to your URL whenever user pushes to the repository. Pull Request POST - posts to your URL upon one of the actions (approve, unapprove, comment, create, edit, merge, decline) related to the Bitbucket's pull request feature....
check out a “pull request” on Git to review/test a PR
git,github,git-pull,pull-request
It's somewhat underdocumented, but GitHub provides pull requests as branches on your Upstream repository so you don't need to add remotes for each third party who might send you a pull request. So git fetch Upstream pull/1044/head:pr1044-from-someone will make the commits in the pull request available in your local repository...
Is it possible to filter who is notified for a pull request?
I'm afraid what you exactly want is not possible with the current GitHub version. Generally speaking I'd consider: if the project is not too big and shouldn't be splitted into more projects? You may use either git submodules or a language/framework related tool (Ruby gems, Python PyPI, PHP Composer, NodeJS...
Git - What happens to my local master branch after a pull request? How do I manage multiple in progress branches?
git,github,version-control,merge,pull-request
Yep, sounds like you're essentially wanting your own local integration branch(es). In that case, you would do just what you said; branch off the main line (or one of your feature branches if you want that as a starting point) and merge in the pieces you want. That way you...
Apply github commit / pull request as a patch
git,github,pull-request,git-patch
github provides patches for individual commits and pull requests (though I can't find the documentation for this). You can generate the patch url by simply appending .patch to the end of the original url. So, use https://github.com/JWalker1995/minisat/commit/a8cef9d932552b2ec155d5e0d44d8fe0efa3a235.patch for the first, and https://github.com/niklasso/minisat/pull/17.patch for the second. The general url github.com/original/url/id would...
What happens to the history of git pull requests when a new branch with the same name of an old branch is pushed
1) yes it is possible to push the same branch name after a branch is deleted 2) no, any pull requests for the former branch of the same name would not be updated. When Branch A is deleted, the open pull requests to merge Branch A somewhere else are closed....
git, is it possible to send pull request from master branch?
git,github,pull-request,cherry-pick
Since, I only have master branch and I guess my only solution is cherry-pick from my first commit and then put all my changes on new branch and continue PR process. You don't have to cherry-pick anything: you can simply create a new branch on top of your current...