Roll20 uses cookies to improve your experience on our site. Cookies enable you to enjoy certain features, social sharing functionality, and tailor message and display ads to your interests on our site and others. They also help us understand how our site is being used. By continuing to use our site, you consent to our use of cookies. Update your cookie preferences .
×
Create a free account

Syncing with Github

1470143668
David
Sheet Author
I am trying to push commits to Github and I keep getting sync failed because suddenly I don't have permission to push changes. I have tried with two different accounts with the same result. Anybody ran into this problem before?
1470152627
Scott C.
Forum Champion
Sheet Author
API Scripter
Compendium Curator
Are you making a fork of the repository, and then uploading to that? After that, are you doing a pull request?
1470154891
David
Sheet Author
Yes I forked the repository and then cloned it to the desktop app. The changes I made where merged last week.  Over the weekend I made some more changes over the weekend and committed them and created a pull request.   I got a message saying that there was a conflict because changes were made by phil and that I should sync.  I did a sync in the desktop app and then copied by changes into the apps github folder and then committed them  but I did not get a publish button just a sync button.  When I clicked that I get the permissions error.  Now I am confused, if my desktop app is connected to the fork in my repository, if phil makes changes to the roll20 repository how does my repository on github get updated.  Do I have to refork  the roll20 repository every time phil does the pull requests and then clone it to my desktop app again.?
1470156580

Edited 1470156676
chris b.
Pro
Sheet Author
API Scripter
I've only had permissions problems like that when I was accidentally pointed to Roll20's repository instead of my own. In the app make sure Roll20/master is on top and "master" is under it, since it's easy to change where you are pointing to, and the branch on top says "master". Circled in screenshot below, i commit to "master" and the pull request automatically chooses "Roll20/master" As you can see in my screenshot, i have not merged/updated from Roll20 in a long time, normally you don't have to as long as the directory you are interested in is up to date. (sometimes it forces me to, i think when new files are added).
1470157971
David
Sheet Author
I only have one line of changes.  But in my desperation I deleted the desktop app repository and when I cloned it again I cloned from the Roll20/master.  I will delete my fork in github website repository, refork from roll20 and then clone the fork to my desktop app.
1470160344

Edited 1470176514
David
Sheet Author
Ok it looks like this now and I could sync with out any errors (still don't know why it says sync instead of publish) Don't know why I am not getting any changes shown. There does not seem to be any conflicts this time but I guess I will have to wait a week to find out.
1470175939
Rob
Pro
Sheet Author
i dont bother with the various programs out there this is the method i use go to you github account 1 fork the repository 2 go to your fork 3 create a file ending in a “/“ this creates a folder 4 go to that folder 5 copy/paste files into that folder from your own machine ( put the sheet image in first as that seams to allow you to put the css and html files in easier ) 6 hit commit 7 then create a pull request Rob
1470183180
Scott C.
Forum Champion
Sheet Author
API Scripter
Compendium Curator
oh, that's nice Rob. I knew there had to be a way to make folders on the website.
1470209680
Lithl
Pro
Sheet Author
API Scripter
David said: still don't know why it says sync instead of publish Publish means it's a branch that only exists on your local (cloned) copy, not on your server (forked) copy. Once you publish a branch once, you never publish that branch again. Scott C. said: I knew there had to be a way to make folders on the website. There didn't used to be. It used to only be possible to edit files on the web (not create folders or files), and the desktop app couldn't create pull requests (you had to do it from the web).