diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-08-19 14:26:11 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-08-19 14:26:11 -0400 |
commit | fcdbe2cbe9fa973c98a076e9b1498aeb0cb59f09 (patch) | |
tree | 61a0f33fe20e22852e16f3b4f7d917fdb13f243f | |
parent | 26d3a585ce1afaf015add0dca0bcedda01f8755c (diff) |
response
-rw-r--r-- | doc/forum/Github_pull_request_with_git-annex/comment_1_03023d2fba47e84d03573d996e8366cf._comment | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/forum/Github_pull_request_with_git-annex/comment_1_03023d2fba47e84d03573d996e8366cf._comment b/doc/forum/Github_pull_request_with_git-annex/comment_1_03023d2fba47e84d03573d996e8366cf._comment new file mode 100644 index 000000000..ef165fe94 --- /dev/null +++ b/doc/forum/Github_pull_request_with_git-annex/comment_1_03023d2fba47e84d03573d996e8366cf._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-08-19T18:17:17Z" + content=""" +Your pull request should be for the branch you changed. In this case, the +`master` branch. This is the same as adding files to a regular git +repository and making a pull request for that. + +The changes that git-annex makes to the `git-annex branch` can either be +ignored by the person who merges your pull request, or they could opt to +fetch your git-annex branch and let git-annex auto-merge it for them. A +manual review and pull request of the `git-annex` branch is not likely to be +productive. Whether they need to merge your `git-annex` branch into their +`git-annex` branch depends on whether git-annex's information about eg, +locations of file contents needs to be passed along with your pull +request. + +Note that GitHub does not support using git-annex to upload the content of +annexed files to it. (GitLab does support this.) This GitHub limitation +may cause problems with this kind of workflow. +"""]] |