Update the project README.md file about vms HOT 5 CLOSED

@vubo This would be a good issue to practice your markdown skills and git/github skills for branches and pull requests.

Helpful reminders:

1. Update your master branch.
   * git checkout master
   * git remote -v (make sure you have an upstream remote)
   * git fetch upstream
   * git rebase upstream/master
   * git status
   * git log
2. Create a new branch for your README edits
   * git branch <new_branch_name>
   * git checkout <new_branch_name>
3. Work on your edits
   * git status
   * git add <changed_file or files>
   * git commit -m"message about the change"
   * git log
   * git status
   * git push origin <new_branch_name>
4. Go into GitHub and create a pull request

from vms.

@willingc, thank you very much for your help and reminders!

I have a small question. When I do the first part:

1. Update your master branch.
2. git checkout master
3. git remote -v (make sure you have an upstream remote)
4. git fetch upstream
5. git rebase upstream/master
6. git status
7. git log

In the logs I see, that the last commit is from me: Fix two bugs... But in systers/master there are not this commits: https://github.com/systers/vms/commits/master

And if I do PR, I will send this old commits too.

How can I pull only my last commit (test commit)?

Thank you!

from vms.

@vubo you'll need to create a new branch, cherry-pick the desired commits and then submit a PR.
(I do it this way)

from vms.

@jayesh92 Nice teamwork commenting on this issue and sharing git cherry-pick. You are correct that cherry-pick would be one way to do this.

@vubo and @jayesh92: While one could certainly use git cherry-pick to create a PR, it would be better, in the long run, to get the local master branch history to be the same as 'upstream', 'origin', and locally.

Valeria, good job noticing that the 'git log' history locally and upstream for master do not have the same commits. In systers/vms repo, the most recent commit is 0190b90 (or the HEAD of the systers/vms master branch).

Looking at Valeria's origin repo at https://github.com/vubo/vms, the master branch is 3 commits ahead of upstream.

And Valeria's origin/test branch (current feature branch) at https://github.com/vubo/vms/tree/test is 4 commits ahead of upstream/master.

Yikes, I need to be in a meeting.

Here is a good resource for understanding branches and git visually: http://pcottle.github.io/learnGitBranching/

More to come later...

from vms.

@willingc and @jayesh92 thank you, I did it: #18

I used reset --hard and then cherry-pick.

I'm turning to the README file now.

from vms.