GitHub Desktop

Discuss coding questions, pull requests, and implementation details.
User avatar
MeteoricDragon
Posts: 137
Joined: Mon Feb 12, 2018 8:23 pm

GitHub Desktop

Post by MeteoricDragon » Mon Mar 26, 2018 11:38 pm

While in Github Desktop, I have the master branch selected, and there are six checkmark-able changed files that have been under "changes" for the past 7 days. Soundreplacement.cs, VideoReplacement.cs, DaggerfallAutomap.shader, GlobalFog.shader, ProjectSettings.asset, and ProjectVersion.txt. They each have yellow boxes with yellow circles next to them. I've been clicking on Fetch for master branch but those changed files still remain. They aren't files that I have modified. I've been looking at the history section and I can see that a lot more files than those six I mention have been changed. I'm not sure why those are the only ones listed.

User avatar
Interkarma
Posts: 3590
Joined: Sun Mar 22, 2015 1:51 am

Re: GitHub Desktop

Post by Interkarma » Tue Mar 27, 2018 12:03 am

If you have "changes" open, these are files that are different on your end compared to master. If you select them, you'll typically see a difference preview on the right showing what the changes are.

If you don't care about changes on your end, you can just right-click file and select "discard changes" to revert back to master copy. Then you can click Sync to ensure you have the latest files.

User avatar
Interkarma
Posts: 3590
Joined: Sun Mar 22, 2015 1:51 am

Re: GitHub Desktop

Post by Interkarma » Tue Mar 27, 2018 12:13 am

If you don't mind, I might let others in the community help field some of these questions as well. I don't always have much time to assist. :)

In the meantime, some great resources for GitHub and their desktop client can be found on GitHub Guides and Desktop Guides.

You can also find some great tutorials around Unity's workflow (such as adding and referencing components) on the Unity Learn site. There are some excellent free courses around the web as well.

User avatar
MeteoricDragon
Posts: 137
Joined: Mon Feb 12, 2018 8:23 pm

Re: GitHub Desktop

Post by MeteoricDragon » Fri Mar 30, 2018 12:37 am

Thanks, that's fine. I have referenced the tutorials but I have run into a problem. While trying to publish my branch so I can submit a PR, I get the following message:
Authentication failed. You may not have permission to access the repository or the repository may have been archived. Open options and verify that you're signed in with an account that has permission to access this repository.
So I opened options and verified that I'm signed in.

User avatar
Jay_H
Posts: 1656
Joined: Tue Aug 25, 2015 1:54 am

Re: GitHub Desktop

Post by Jay_H » Fri Mar 30, 2018 1:36 am

I had that same warning when I was accidentally trying to upload to the administrator repository. You'll want to upload to your own copy of the repository, and then when your copy is written onto, you can tell github to compare your repository with the administrator one. Then the pull request becomes possible.
Try over 120 all-new quests in the first Daggerfall Unity Quest Pack.

User avatar
MeteoricDragon
Posts: 137
Joined: Mon Feb 12, 2018 8:23 pm

Re: GitHub Desktop

Post by MeteoricDragon » Fri Mar 30, 2018 2:10 am

Jay_H wrote:
Fri Mar 30, 2018 1:36 am
I had that same warning when I was accidentally trying to upload to the administrator repository. You'll want to upload to your own copy of the repository, and then when your copy is written onto, you can tell github to compare your repository with the administrator one. Then the pull request becomes possible.
Ok, I think I made a PR successfully. Since I forked Daggerfall Unity from the administrator repository. If any commits are made to the administrator repository after I download my fork do I need to re-copy my copy of his repository? :? or does my fork copy those changes?

Right now I have the cloned copy of DFU from Interkarma, and the cloned copy from my fork of interkarma's master. I'd want to develop with my copy of the fork, right?

User avatar
Interkarma
Posts: 3590
Joined: Sun Mar 22, 2015 1:51 am

Re: GitHub Desktop

Post by Interkarma » Fri Mar 30, 2018 2:38 am

Great stuff, thank you for that. I can see the PR there and will process this as soon as I have time. If I have any feedback or need changes made before merging, I will add that to the comments on the PR.

And yep you've got it right - develop on your fork and send your changes to me via PR. It also helps to make a branch on your end for changes so you can keep them separate from the master code.

User avatar
MeteoricDragon
Posts: 137
Joined: Mon Feb 12, 2018 8:23 pm

Re: GitHub Desktop

Post by MeteoricDragon » Fri Mar 30, 2018 9:08 pm

Interkarma wrote:
Fri Mar 30, 2018 2:38 am
Great stuff, thank you for that. I can see the PR there and will process this as soon as I have time. If I have any feedback or need changes made before merging, I will add that to the comments on the PR.

And yep you've got it right - develop on your fork and send your changes to me via PR. It also helps to make a branch on your end for changes so you can keep them separate from the master code.
Does my fork update with changes that you commit to your master?

User avatar
TheLacus
Posts: 681
Joined: Wed Sep 14, 2016 6:22 pm
Contact:

Re: GitHub Desktop

Post by TheLacus » Fri Mar 30, 2018 9:27 pm

MeteoricDragon wrote:
Fri Mar 30, 2018 9:08 pm
Interkarma wrote:
Fri Mar 30, 2018 2:38 am
Great stuff, thank you for that. I can see the PR there and will process this as soon as I have time. If I have any feedback or need changes made before merging, I will add that to the comments on the PR.

And yep you've got it right - develop on your fork and send your changes to me via PR. It also helps to make a branch on your end for changes so you can keep them separate from the master code.
Does my fork update with changes that you commit to your master?
No, but you can use git pull --rebase after Interkarma accepted your PR. You can also use git pull but this creates a merge commit.
If you are interested in creating mods for Daggerfall Unity you can find the documentation here.

User avatar
MeteoricDragon
Posts: 137
Joined: Mon Feb 12, 2018 8:23 pm

Re: GitHub Desktop

Post by MeteoricDragon » Sat Mar 31, 2018 12:56 am

TheLacus wrote:
Fri Mar 30, 2018 9:27 pm
MeteoricDragon wrote:
Fri Mar 30, 2018 9:08 pm
Interkarma wrote:
Fri Mar 30, 2018 2:38 am
Great stuff, thank you for that. I can see the PR there and will process this as soon as I have time. If I have any feedback or need changes made before merging, I will add that to the comments on the PR.

And yep you've got it right - develop on your fork and send your changes to me via PR. It also helps to make a branch on your end for changes so you can keep them separate from the master code.
Does my fork update with changes that you commit to your master?
No, but you can use git pull --rebase after Interkarma accepted your PR. You can also use git pull but this creates a merge commit.
I've looked up git pull --rebase, and I kind of understand what it does. rebasing so your commits aren't created. But I don't understand where it gets input, do i type it in some kind of command prompt?

EDIT: I see.. it's a seperate program from github desktop...

Post Reply