On 12/08/12 15:01, Dan Haywood wrote:
>
>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.
I was slightly confused about this as I didn't have a branch that I was
merging back in. I'd only made changes to master. Also I hadn't got
to the part of the ProGit book about how cool rebase is. I'll use it
next time and see the difference (certainly the history in my git viewer
shows what looks like a branch).
I'll get used to it over time, as it is quite different in a number of ways.
Rob
