Silly Git question

[eastwind]

Ah, maybe that's it. I only deleted the one on the server - it's a small bit of bother to delete the local copy and recreate it, but I'll give that a whirl. Your posting your experience is really valuable! Thanks a lot.

[eastwind]

Thanks again, your advice to create a local branch worked, and I managed to push another small fix. Getting my fork updated from the master was more troublesome, I ended up having to make a pull request against my own branch (vs the usual ones against master), and then accept it. I couldn't find another way to get the web page to sync your recent commits into my fork.

That has resulted in my branch being temporarily one commit ahead of master (the commit that pulled the changes from master to my branch). Hopefully that doesn't cause trouble later.

Next I'll see whether I can do anything to clean up the non-fatal compiler warnings I'm seeing.

[backwardsEric]

Thanks again, your advice to create a local branch worked, and I managed to push another small fix. Getting my fork updated from the master was more troublesome, I ended up having to make a pull request against my own branch (vs the usual ones against master), and then accept it. I couldn't find another way to get the web page to sync your recent commits into my fork.

To sync the master branch in GitHub's copy of your fork with what's in Angband's master branch, I would recommend pushing from your local copy. That would look something like:

1. Check out the master branch in your local copy:

   git checkout master

2. Pull the changes into it from the Angband repository:

   git pull https://github.com/angband/angband.git

   .
3. Push those changes to the copy of your fork on GitHub:

   git push https://github.com/Eastwind921/angband.git

With remotes configured, you can skip having to supply full URLs. Someone who's more familiar with this probably can recommend what a standard remote configuration would look like for this scenario and the git remote commands to run to get it.

[eastwind]

Ok, thanks, I'll try that. I really appreciate all the hand-holding.

[Pete Mack]

Note:
git fetch ...
is equivalent to
git checkout master
git pull ...