- Posts: 304
Authority to access Deviation User manuals repo
- Arnold
- Topic Author
- Offline
Help, please.
<edit:> I have already tried resetting the SSH key and relinking it with my Git account.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
git clone github.com/DeviationTX/deviation-manual.git
I don't see any forks of the deviation-manual page by you, but once you are logged in to github on the website you should be able to fork it, then go to that fork and get the url. here you'll need your user-id if you want to be able to push changes to your repo in the future:
userid@github.com/userid/deviation-manual.git
(or you can wait until you do the push to add that info)
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
A simple pull request has been submitted just too ease my mind
Merged the change into Master, since I could.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
github.com/DeviationTX/deviation-manual
and you do not have commit access to the main repository.
What commands did you execute?
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
github.com/Treadmule/deviation-manual/pull/1
I believe that shows I did the Pull Request and then I merged my change into the master repo.
I see what you are saying, but I can't explain it.
<edit> I am using the GitHub desktop app, rather than the CLI/Terminal, FWIW.
<edit#2> Now I see my fork (Install-edits), where it didn't appear previously. Maybe Git needs time to "bake". I dunno.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
github.com/DeviationTX/deviation-manual
And press the 'new pull request' button. Then make sure you select the deviationtx repo as the destination and your repo as the source (sorry, I can't actually test it since I don't have any pending changes, but hopefully it is obvious what to do)
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
I see the button and when I click it, I get a page to Compare between a base branch and a head branch. I don't seen anything about source and destination. And, since I've created a new branch for the simple change I've just made to the "install" document, my branch does not show up as a choice for comparison (with the master) on that web page. So I can't go forward with this.
<Edit> This seems to be a lot more problematic than it ought to be. Maybe I should not use the desktop app and work out how to do this another way.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
github.com/Treadmule/deviation-manual
Just make sure you select DevaitionTx/deviation-manual as the 'base fork' and 'Trwadmle/deviation-manual as the 'head fork'
I need to put some instructions on the wiki for using Github I guess
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
But, note this:
On that Compare page, you can see a green checkmark along with the comment, "Able to merge". That's how I was able to merge my previous Pull Request.
... sorta like a loaded gun ...
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
github.com/Treadmule/deviation-manual/pull/2
...wrong ...
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
It all looks good when viewing my fork of the repo, but the real repository at Git has not changed. Back to square one.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- mwm
- Offline
Arnold wrote: Wrong, wrong, wrong, wrong,... wrong!
It all looks good when viewing my fork of the repo, but the real repository at Git has not changed. Back to square one.
That's actually what we expect. You probably merged your changes back to the master branch in your repository, not back to our repository. You should be able to merge from either the master branch or your new one into our repository.
To do that, click on the "Pull requests" tab and then click on "New pull request". The base fork should be "deviationTx/deviation-manual", base "master". The head fork should be your repository. Selecting either the master branch or your new one should get the changes you made, and github may not let you use one since you merged them. Then click "Create pull request" to actually create the request.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
mom wrote: ... You probably merged your changes back to the master branch in your repository, not back to our repository.
Yes, lesson learned.
... click on the "Pull requests" tab and then click on "New pull request".
On the web page, "DeviationTX/deviation-manual", I see the menu at the top of the window with "| Pull Requests | Issues | Gist" |, If I click on that "Pull Requests", I get a page showing an open Pull Request named "Install Edits2" that I had submitted last night before closing up.
Lower on the page I see what look like tabs with "| Code | Issues | Pull Requests | Wiki | Pulse | Graph |.
So, I'm thinking this is the tab you're talking about. Clicking on that tab brings a page showing "There aren't any open Pull Requests." with the green "New Pull Request" button on the right side of the page. ... wait a minute ... what about the open Pull Request I just saw?
i click on the green button which takes me to the "Compare" page..
The base fork should be "deviationTx/deviation-manual", base "master".
No, I see only, "base: master". Nothing saying "deviationTx/deviation-manual". Clicking on the "base:master" button allows me to choose from other branches, but deviationTx/deviaiton-manual is not among them.
Next to the "base: master" button is another button labelled, "Compare: master" - nothing about head fork.
The head fork should be your repository. Selecting either the master branch or your new one should get the changes you made, and github may not let you use one since you merged them. Then click "Create pull request" to actually create the request.
I see nothing relating to my repo. Clicking on "Compare: master" allows me to again choose from other branches, but nothing is there about my repo or branches.
Perhaps you will be relieved when I say that I think I can see the end of my rope from here.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- mwm
- Offline
Arnold wrote: [quote="mom" post=47235
... click on the "Pull requests" tab and then click on "New pull request".
On the web page, "DeviationTX/deviation-manual", I see the menu at the top of the window with "| Pull Requests | Issues | Gist" |, If I click on that "Pull Requests", I get a page showing an open Pull Request named "Install Edits2" that I had submitted last night before closing up.
...
The head fork should be your repository. Selecting either the master branch or your new one should get the changes you made, and github may not let you use one since you merged them. Then click "Create pull request" to actually create the request.
I see nothing relating to my repo. Clicking on "Compare: master" allows me to again choose from other branches, but nothing is there about my repo or branches.
That's because you opened the "Pull requests" tab on the wrong repository. You need to open it on your repository, not the deviationTx one. Not really your fault - I didn't tell you which one to open. But this tab is where you create pull requests FROM the repository back to the one it was cloned from, not TO the repository from - well, there's no way to know where from in general.
Do not ask me questions via PM. Ask in the forums, where I'll answer if I can.
My remotely piloted vehicle ("drone") is a yacht.
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
I wonder if it would be worth setting up the RST plugin for dokuwiki along with the gitbacked plugin. With that setup, the manual could be edited using the wiki framework (though you'd need to use RST syntax, which could be confusing) and we would still have a GIT backed repository. The obvious risk is that we would give up control of the contents to some extent. I am not convinced it would necessarily help to draw more contributors, but I'm open to the idea if there is interest.
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
mwm wrote: ...That's because you opened the "Pull requests" tab on the wrong repository. You need to open it on your repository, not the deviationTx one. ...
OK, this sounds much like PB's post #47208 previously.
What I observed, while trying to do this, is that when I'm in my repository at github.com/Treadmule/deviation-manual , and use the Pull Requests tab I can see information about pull requests and the green button, "New pull request". Pressing that button, immediately goes away from my repository to the DeviationTX/deviation-manual repository, Comparing changes page where I can set up those parameters you've outlined. . I can't see how I've done something wrong at this stage. It looks like I'll be learning the same lesson again.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
PhracturedBlue wrote: I'd like to add a step-by-step with pictures in the wiki at some time. If someone wants to help us out with the manual we should minimize the dependence on being familiar with GIT to do so. I think for code development, this is less critical (it is fair to expect some familiarity withVCS when working on a complicated code base), but accessing and updating the manual should be made as easy as possible....
For my part, I agree 100%. I'll do what I can to help.
In the mean time, I've set up a training exercise for myself to learn using git through the command line. That's my last-ditch effort until something better comes along for editing the manual.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- Arnold
- Topic Author
- Offline
- Posts: 304
Missing Git Add seems to have been my downfall.
Too many hobbies & too many Devos!
Who knows where the time goes?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
Thanks for your effort on this.
Please Log in or Create an account to join the conversation.
- Home
- Forum
- Development
- Development
- Authority to access Deviation User manuals repo