Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare a Git Branching Model. #42

Closed
cvvergara opened this issue Apr 29, 2015 · 5 comments
Closed

Prepare a Git Branching Model. #42

cvvergara opened this issue Apr 29, 2015 · 5 comments

Comments

@cvvergara
Copy link
Member

Difficulty level: Unknown
Urgency: Before coding starts.
preconditions: After several ISSUES being marked as feature request .
How its going to be implemented: Based on how this tagging scheme works, we can decide how to handle the branching model:

  • can be based on issues preconditions/postconditions?,
  • based on difficulty?,
  • a combination?
  • Branches with meaningful names.

http://nvie.com/posts/a-successful-git-branching-model/

@sarthak0415
Copy link
Contributor

made a branch named gsoc-develop.

@cvvergara
Copy link
Member Author

gsoc-develop in @sarthak-0415 's fork.
and now we have a gsoc-develop in the main repository.
Its a good moment to experiment on how to handle the branching model.

So, lets experiment the follwing:
@sarthak-0415 works on his fork, and when the code gets to a stable state (like no errors when compiling) we do:
update the content from sarthak-0415/osm2pgrouting with pgRouting/osm2pgrouting.
Updating can be easily done with 2 mouse clicks:
1st: Create a Pull request in Sarthak's branch
2nd: Merge the Pull request in the main repo.

@dkastl
Copy link
Member

dkastl commented Jun 24, 2015

I think we should work towards v3.0.0, so we can tag issues with this version.
Later each commit will show up in the release notes, so doing this nicely will make a nice release note.

@cvvergara
Copy link
Member Author

On 1:01:00 they use the diagram of the git branching model.
https://www.youtube.com/watch?v=rqKGX2LJOmU

@cvvergara
Copy link
Member Author

This was used for the GSOC2015. So I am closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants