+[10 years ago]VxJasonxVI think git shows merge conflicts. +[10 years ago]FunnyLookinHatVxJasonxV, yeah - just trying to see what I'm getting into before I do the PR +[10 years ago]domino14_does anyone know if there is a way to grant read access to private repo names without granting full access? +[10 years ago]domino14_i.e. if the scope is "repo", this grants full read/write access to the code. I just want read access to commit statuses. if i use repo:status, this suddenly does not list private repos anymore +[10 years ago]domino14_but "repo" lists public and private repos
+[10 years ago]VxJasonxVdomino14_: there is not currently +[10 years ago]abetuskI have a vague process question: I have a repo which I forked. I've since deleted the 'master' branch and made a 'release' branch. I now want to 1) issue a pull request with changes to the original repo and 2) incorporate changes from the original (master branch) repo into my (release branch) repo. Can someone give me a kind of overview of how to do that as painlessly as possible? +[10 years ago]psgsTo pull changes from the fork's original repository, the following tutorial can be followed: https://help.github.com/articles/syncing-a-fork/ +[10 years ago]psgsInstead of following the last step (git merge upstream/master), however, the following command can be used: "git merge upstream/release". +[10 years ago]psgsThis will merge upstream "master" changes into the release branch.