And the original questions…
On what branches (master or ‘mywork’) do people stack their commits before sending a pull request? Do people use merge or rebase to integrate upstream work into their private branches (assuming they have work in progress)? _____ From: [email protected] [mailto:[email protected]] On Behalf Of Mikael Henriksson Sent: Friday, August 28, 2009 7:13 PM To: [email protected] Subject: [fluent-nhib] Re: GIT best practices Thanks James, best source of information I have managed to find so far. I was simply looking for a way to "git fetch upstream master" really. The GUI had already fetched all the changes though it doesn't tell me. On Fri, Aug 28, 2009 at 5:20 PM, James Gregory <[email protected]> wrote: Which repository do you want to update and from where? You need to remember that you're effectively dealing with 3 fully-fledged repositories, your local, your github, then my github. Make sure you've read http://github.com/guides/fork-a-project-and-submit-your-modifications On Fri, Aug 28, 2009 at 2:46 PM, Mikael Henriksson <[email protected]> wrote: What is the command line arguments to do a pull request from master? I just want to update my repository but nothing happens from gui I think and while using command line I am a bit unsure about the commands. git pull -v repository? I am lost :) On Thu, Aug 27, 2009 at 11:25 PM, Morten Maxild <[email protected]> wrote: After supplying a patch (through my fork), that has become obsolete, and therefore will never be applied….. ….I think I have discovered that it is not a best practice to develop on an ‘official’ tracking branch (e.g. master that tracks origin/master), because I want to always be able to pull from the upstream repo, and have git perform an implicit fast-forward merge. Instead I should always develop on a different branch, and push that branch to my fork before sending a pull request. Is this how other contributors are doing? If anybody else can think of other reasons to always develop on a topic branch before pushing and sending a requests to pull the tip of that branch, please enlighten me? Also how do other contributors keep a local development (e.g.. topic) branch up to date after fetching work from the upstream repo (this branch would contain work not ready for the public eye). Do you guys use merge or rebase to bring in upstream work to the local development branch? Also what would the maintainer of the upstream repo prefer (the branch could very well be pushed to a fork in the future, and be the subject of a pull request)? Kind regards Maxild --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Fluent NHibernate" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/fluent-nhibernate?hl=en -~----------~----~----~----~------~----~------~--~---
