On 8 December 2012 10:55, Robert Matthews <[email protected]>wrote:
> Dan > > Did you mean to add the idea directory to the code base? > No ... have now deleted. > > I've made some changes and can't push them because I've used the http > protocol when I cloned. What should I be using? At a guess is it > [email protected]/isis.**git<http://[email protected]/isis.git>for > SSH connection, and can I switch easily. > I see you figured it out. Looking at the history (via gitk --all), I see you did a regular merge, rather than a rebase. I think that using rebases should be the standard procedure... at least, that's the approach that Jeroen and I have adopted, and I think that many other open source projects do so too. At any rate, the procedure is documented on our website, at [1] and [2]. Could you read through and let me know your thoughts. And, for anyone else with Git experience, could you let me know your views? Thx Dan > > Rob > > PS for those of you also getting to grips with Git, I'd recommend the > ProGit book for its pragmatic introduction. I invested in a paper copy of > the O'Reilly book (Version Control with GIT), which is really detailed and > is explaining how everything works internally, but the essentials on how to > work with it isn't in the first section (assuming it is there at all). When > some complex stuff needs to be done later I can see it coming into it own. > I'm sure rebase will be described in there in lots of detail.
