On May 27, 7:37 pm, Piotr Grabowski <grabowski...@gmail.com> wrote: > Hi, > > This week I started coding my project. It' available on branch > soc2012-serialization onhttps://github.com/grapo/django. > > I'm not very familiar with git so I'm not suer that I do it right: > * I forked django repo from github > * clone it to my computer > * create new branch soc2012 > * work in this branch > * push it to origin > > When I want to synchronize my branch with django trunk I will fetch > master from upstream (django/django) and merge master to my branch. > It's this flow good?
I think that is a good way to go. It might be the branch will need some history rewriting when it is otherwise ready for commit, but until then keeping your history intact so that others can easily follow you work is good. One advice I have seen is that you should not merge upstream changes too often, it will just mess up the history. You can easily enough create another branch where you test how your work interacts with master branch. Only merge your soc2012 branch if upstream changes are such that your work needs major changes by them. Trivial merge conflicts do not require merging upstream back. Another option is rebase workflow for the branch, but in this case you should make it absolutely clear that others should not consider your github branch as anything else than a convenient way to publish pa your work as patch-series. The good thing about this way of working is that your changes will be on top of the commit log all the time, and thus it is very easy to see what you have done in your branch. - Anssi -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
