On Tue, Sep 07, 2010 at 01:09:15PM +0100, Toby Gray wrote:
> On 03/09/2010 23:31, Chris Frey wrote:
> > Hi Toby,
> >
> > Thanks again very much for your work on this. I have rebased your branch
> > on to the latest master and pushed it out to the repos with some changes
> > of my own. I rebase to make it easier for me to keep the CVS repositories
> > on sourceforge up to date. Fortunately, there were no conflicts when
> > I rebased your work.
> Thanks for doing that. I noticed you made several style changes,
> especially to where * and & go on types; I'll try to follow those in future.
>
> In attempting to rebase to the latest master I managed to get terribly
> confused and so have just set up a new fork of the barry code at:
> github.com/tobygray/barry
Hi Toby,
Thanks very much for the updated notes. Things make more sense to me now.
Sorry that you had trouble with the rebase. If you have git related
questions, feel free to ask... I'm quite happy to help folks make git
do what they need. :-)
Note that it is possible to "start fresh" in a sense, by creating a new
branch based on your origin/master. Assuming you cloned originally from
me, then origin/master is always my latest. So you can just branch
from there, and start fresh, instead of cloning again.
git fetch origin # make sure you have my latest
git checkout -b newmaster origin/master # start fresh
You can also overwrite your own github repo by forcing the push.
For example, to push your master branch to github, overwriting
what is there, just do:
git push -f github master
- Chris
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Barry-devel mailing list
Barry-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/barry-devel
