You might want to check out git cherry-pick and git rebase... and train your
devs to prefer many small commits over few large ones, so you can pick and
choose what you want.
You should also encourage them to make a branch for every new thing they
work on, never work on multiple features/bugs in the same branch. For that
matter, discourage working directly in master (this includes you), work in
branches and only merge to master. When you have many people on a project
this makes things much more manageable.
Tekkub
Github Tech Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Thu, Jul 9, 2009 at 5:15 PM, shenkin <[email protected]> wrote:
>
> After some discussion, my colleages and I have come up with:
>
> git checkout master
> git merge --no-commit release_branch
> git checkout HEAD . # note dot after HEAD
> git commit -a -m "Fake merge from release_branch"
>
> Comments, alternatives welcome.
>
> -P.
>
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" 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/github?hl=en
-~----------~----~----~----~------~----~------~--~---
