Updating a Github Repository

[godreborn]

do I just need to do a "git pull" to update the repository on my computer without having to delete, then re git clone a repository?

 

[Kazesama]

do I just need to do a "git pull" to update the repository on my computer without having to delete, then re git clone a repository?

this might offer an explanation to the difference between pull vs fetch

https://www.geeksforgeeks.org/git-d...the command,changes into the local repository.

 

[godreborn]

this might offer an explanation to the difference between pull vs fetch

https://www.geeksforgeeks.org/git-difference-between-git-fetch-and-git-pull/#:~:text=Git Fetch is the command,changes into the local repository.

so I'm correct? I have to use git pull origin master for the master directory, but can I just use git pull by itself and it will know which branch was used?

 

[Kazesama]

yea, I think you're on the right track.

cd /pathToYourLocalProjectFolder

git pull origin master

 

[godreborn]

yea, I think you're on the right track.

cd /pathToYourLocalProjectFolder

git pull origin master

then if say it was the 3ds branch, it would be git pull origin 3ds?

 

[Kazesama]

then if say it was the 3ds branch, it would be git pull origin 3ds?

hmm sorry I'm not sure, haven't not really messed with git to that extent. But what I gather you replace "master" with the branch "name" .. but can't confirm personally

 

[Sypherone]

so I'm correct? I have to use git pull origin master for the master directory, but can I just use git pull by itself and it will know which branch was used?

Maybe check on stackoverflow: https://stackoverflow.com/questions...ository-with-changes-from-a-github-repository

 

[godreborn]

let's say that the 3ds version of sm64 is updated on github, and I already have an earlier version of the source code on my computer, instead of deleting it and starting over, I could do something like git pull origin 3ds or main or whatever the branch is called, and it will update the necessary source code?

 

[cherryduck]

Use git checkout.

 

[godreborn]

Use git checkout.

git checkout in the terminal and that's it? no adding in a branch or anything?

 

[cherryduck]

git checkout in the terminal and that's it? no adding in a branch or anything?

You use git checkout to switch branches, which requires you to specify the branch.

git pull updates the branch you have checked out.

Say I'm on the main branch and I want to switch to the 3ds branch:

git checkout 3ds
git pull

That's it, I'm now on the 3ds branch and it's up to date.

 

[godreborn]

You use git checkout to switch branches, which requires you to specify the branch.

git pull updates the branch you have checked out.

Say I'm on the main branch and I want to switch to the 3ds branch:

git checkout 3ds
git pull

That's it, I'm now on the 3ds branch and it's up to date.

thank you, my friend. that makes sense now.

 

[godreborn]

I'm still confused about the difference between git pull and git fetch. what if I want to download a specific commit?

 

[cherryduck]

Fetch checks if there are any updates, pull actually pulls those updates. To pull a specific commit you use git checkout *commit hash*.

It's not recommended though because then you end up in a detached state, and generally speaking you want the latest code. I guess it doesn't matter quite so much if you're not making changes and pushing them to the source repo but it is messy and will put your local copy in a weird state.

 

[thominho]

The "normal" way is to fetch all changes using "git fetch --all" and then update only the branches that you want to update to prevent conflicts with other branches of yours. Conflicts usually happen when you change a file that someone has made changes.

But the novice commands are:
git clone -> Download Repo to your Computer
git log -> to search older commits and their unique number
git checkout [BRANCH_NAME] -> Change Repo to the specified branch or change to a commit using the unique number
git pull -> Update Repo to your Computer to the latest changes
git add -> add changes
git commit -> persist locally changes with a message
git push -> send the persisted changes locally to online to allow others to see these changes

 

[9x0]

The "normal" way is to fetch all changes using "git fetch --all" and then update only the branches that you want to update to prevent conflicts with other branches of yours. Conflicts usually happen when you change a file that someone has made changes.

But the novice commands are:
git clone -> Download Repo to your Computer
git log -> to search older commits and their unique number
git checkout [BRANCH_NAME] -> Change Repo to the specified branch or change to a commit using the unique number
git pull -> Update Repo to your Computer to the latest changes
git add -> add changes
git commit -> persist locally changes with a message
git push -> send the persisted changes locally to online to allow others to see these changes

Adding to novice commands, git status -> lists "staged" changes
Useful to check before git commit
Rework of novice commands are:
git clone -> Download Repo to your Computer
git log -> to search older commits and their unique number
git checkout [BRANCH_NAME] -> Change Repo to the specified branch or change to a commit using the unique number
git pull -> Update Repo to your Computer to the latest changes
git add -> add or "stages" changes
git status -> lists "staged" changes
git commit -> persist locally changes with a message
git push -> send the persisted changes locally to online to allow others to see these changes