clrCoda wrote in Wed Apr 22, 2015 5:23 am:The reason you did not see a dif in the last pull request from me is that the change was to a binary PNG file correcting the paint job.
-- Take good care -- Ray
The reason I do not see a diff is because you had not completed the submission of your changes, whatever these may be.
(maybe you had not commited? or pushed?)
I know this as a fact, because I can see all commits pushed over your repo on any branch here:
Master:
https://github.com/Raystm2/b1900d/commits/masterglobal:
https://github.com/Raystm2/b1900d/commits/globalVAAnd I can see there are no new commits with any change over any PNG occuring
Did you
- Code: Select all
git add .
git commit -m "message"
git push origin globalVA
over your local computer repo, after making changes?
Once the new commit comes into your globalVA branch at github, then you could go ahead and submit the pull request over FGMEMBERs GlobalVA branch to update globally and bring the changes to the whole community.
Let's walk you thru
************
Step 1: Do your changesOn your local repository (your computer) do any change over the source you need/intend to
This may include changing a PNG, or updating an url, or really -- whatever you need to
Step 2: Verify your changes- Code: Select all
git status
This is the most useful git command ever. It tells you exactly where your local repo stands over your origin (remote repo)
It is a verbose but really clear output
It will tell you if remote have commits you don't. It will tell you if local have unpushed commits (that remote does not). It will tell you if your local repo has unstaged (unadded files) or uncommitted (modified/deleted) changes.
Step 3. Add- Code: Select all
git add --all
#or git add . #there is a period at the end
Will add unstaged files, you can verify with git status again
Step 4. Commit- Code: Select all
git commit -m "an explanatory message of what I've done"
#This is the most magical of the git commands
#it will create a step in your development ladder
#you can come back to these steps anytime later
#commit frequently, but not too much. What is a sensible change? you decide
Step 5. PublishYou can send 1 commit or N commits to your remote public repo
That effectively publishes the changes to the world.
Here you want to make sure, before publishing that your repo is good, and your changes can go remote. Once go remote, always remote.
Never, ever do a history rewrite remotely, unless YOU REALLY REALLY know what you are doing.
This include delete all history with "initial commits" type of misdemeanors, if you know what I am talking about
Remote repositories have aliases, for short names. A classical alias is origin. The remote used when "cloning", and where you usually want to pull and push from.
you can check with
- Code: Select all
git remote -v
Tipically a very verbose answer will tell you that remote origin is, in your case, example
"origin
git@github.com:Raystm2/b1900d.git [push and pull]"
Meaning that is the repo aliased origin, and you push and pull to it
Now publishing is really
pulling and then pushing. I advise you get pulling before pushing as your second nature. It will be of great help if working with collaborators. Also keep in mind the branch you are working on, which should be globalVA
- Code: Select all
git branch
Should respond
* globalVA
Then,
- Code: Select all
git pull origin globalVA
Pulls from origin to globalVA bringing new changes up to date. You can avoid the alias and use a full name, and if you ARE in the proper branch you can avoid using the branch name to, so these are sinonimous with previous command
- Code: Select all
git pull git@github.com:Raystm2/b1900d.git globalVA
git pull git@github.com:Raystm2/b1900d.git
git pull
By default git pull will pull from origin into the brach you are at, at the moment, making for the shortest most effective command
After pulling, publishTo publish, you use the similar command git push (it works just as pull, but in the other direction!, instead of copying from remote to local, it copies from local to remote)
- Code: Select all
git push origin globalVA
identical to saying
- Code: Select all
git push git@github.com:Raystm2/b1900d.git globalVA
(push defaults to master, so in your case always specify which branch you are writing to the remote!)
That is
- Code: Select all
git push
Always means
- Code: Select all
git push origin master
I hope it helps IH-COL
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it? Probably not, because if they don’t recognise their freedoms, they’ll let their freedoms fall