Meeting May 26: Keeping Upto Date

[thisisashukla]

• Keeping my branch up to date with the latest version on the main repository is very important so that my fork's branch is in sync with the latest changes in the main repository

• Blame - Blame is the last author that modified the section blamed

• Once the code has been merged into the master branch of the main repository, the contribution becomes permanent in the history of the code base

• Even if the old code is removed, it still remains in the history of the code base and the contributors mention also remains.

• By the contributions tab in a repository one can view the quantity and quality of one's code contributions. This can be used to evaluate a person's contributions

• So, it is advisable to make a habit of doing:

  • git fetch upstream and where applicable
  • git checkout branch
  • git merge upstream/branch IMPORTANT: To each branch used to develop GSoC project also do:
  • git checkout branch
  • git merge upstream/develop

• Delete the branches not requireed

  • [x] fix/forloops
  • [x] gsocprac2
  • [x] practice/mydijkstra

• [x] Read carefully - http://railsware.com/blog/2014/08/11/git-housekeeping-tutorial-clean-up-outdated-branches-in-local-and-remote-repositories/

• [x] Master and Develop of the fork should be same as that on the main repository

• [x] Publish a the GSoC branches on my fork

• [x] Make gsoc/areaContraction my default branch

[thisisashukla]

Goals

• Ultimate Goal - Code to be a part of the pgRouting release
• Intermediate Goal - Code to be a part of develop to be sure that it will be a part of a release
• GSoc Goal - Deliver code that can be a part of a release
• Personal Goal - Pass GSoC

Which code is "Delivered Code"

• Code in my fork is not considered as delivered
• Code in main repo is considered as delivered

Code not merged in the main repo is a DEFINITE FAIL If I do not keep my develop updated regularly, it might be difficult to merge my code later, thus it is advisable to update fork once a while, by following the given steps:

• git fetch upstream see if develop changed and if it did change
• git merge upstream/develop
• git merge upstream/develop
• git push origin develop
• Doing a PR and merge to your main repo's gsoc branch will be good if done once a week

[thisisashukla]

How to recreate a branch on clone and the fork in case I mess up in my clone

• git branch -d branchname Delete the same branch on the fork also on the branches page
• git checkout upstream/brachname
• git checkout -b branchname
• git push -u origin branchname

[thisisashukla]

Difference between Clone and Fork

• Clone is in your computer but fork is on Github.
• You have a clone in your computer, and the origin part is from your fork and the upstream part is main repository. So in your one clone you can access main repository and your fork.

[thisisashukla]

Pull Requests:

Make sure the PRs are towards the GSoC Milestone

[thisisashukla]

My Work

• Worry about my branch - gsoc/areaContraction
• Make sure my master and develop are same as that of main repo
• If they (master & develop) pass in main repo, even if failing in my repo I am good

[cvvergara]

Dont close this issue, keep it open during the course of the program, might be of help You can add a label "Infomation", just to know that you can find information in this issue

[thisisashukla]

sure maam but i am unable to add information label

[cvvergara]

can you google: github create label