Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for Basic Roleplaying, RENAISSANCE and the Void #1797

Closed
wants to merge 6 commits into from
Closed

Changes for Basic Roleplaying, RENAISSANCE and the Void #1797

wants to merge 6 commits into from

Conversation

Lockbox313
Copy link
Contributor

No description provided.

@pjbehr87
Copy link
Contributor

pjbehr87 commented Aug 1, 2016

You've got merge conflicts. Please resolve these and reopen the Pull Request. I think it's because I had to make some changes to the sheet.json and replace the preview image. It's a good habit to update from the master branch before creating your pull request each time.

@pjbehr87 pjbehr87 closed this Aug 1, 2016
@Lockbox313
Copy link
Contributor Author

I did a sync with the master it will not bring down the changes you made.

@Lockbox313
Copy link
Contributor Author

Lockbox313 commented Aug 2, 2016

The only way I could get your changes was to delet by local repository and clone the master again. Now when I make commits I am being told by github that I do not have permission to publish

Windows PowerShell
Copyright (C) 2009 Microsoft Corporation. All rights reserved.

WARNING: posh-git support for PowerShell 2.0 is deprecated; you have version
2.0.
To download version 3.0, please visit
https://www.microsoft.com/en-us/download/details.aspx?id=34595
For more information and to discuss this, please visit
dahlbyk/posh-git#163
To suppress this warning, change your profile to include 'Import-Module
posh-git -Args $true'.
C:\Users\David\Documents\GitHub\roll20-character-sheets [master ↑]> git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
C:\Users\David\Documents\GitHub\roll20-character-sheets [master ↑]> git push
remote: Permission to Roll20/roll20-character-sheets.git denied to Lockbox313.
fatal: unable to access 'https://github.com/Roll20/roll20-character-sheets.git/'
: The requested URL returned error: 403
C:\Users\David\Documents\GitHub\roll20-character-sheets [master ↑]>.

@pjbehr87
Copy link
Contributor

pjbehr87 commented Aug 2, 2016

You don't want to "clone" the repo, you need to "fork" it. Cloning is pulling the actual repo down locally on your computer, and you don't have permission to modify the repo directly. Forking the repo will create an exact copy of the repo, or a branch, that you have permission to edit. A Pull Request is when you ask permission to merge changes from your branch into our master branch. If you delete your old branch (create a local copy of your new sheet first so it doesn't get deleted), then create a new fork you can add your new sheet back to that branch then create a new PR.

If you have any more questions please let me know.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants