Re: [boost] [git] Mercurial?

Subject: Re: [boost] [git] Mercurial?
From: Bronek Kozicki (brok_at_[hidden])
Date: 2012-03-20 09:25:45

On 20/03/2012 12:21, Thomas Heller wrote:
> On 03/20/2012 12:50 PM, Oliver Kullmann wrote:
>> On Tue, Mar 20, 2012 at 12:30:31PM +0100, Thomas Heller wrote:
>>> On 03/20/2012 12:03 PM, Julian Gonggrijp wrote:
>>> <snip>
>>>> Basic usage of git is different from basic usage of svn in some
>>>> crucial aspects, but similar enough for anyone to be able to adjust
>>>> even if you don't like it. It can definitely be learnt within a day.
>>>> Why don't you just give it a try? It never hurts to learn something
>>>> new.
>>>
>>> *SIGH* you keep assuming that i never tried git. My last adventure
>>> with trying to use git was around half a year ago. I still have
>>> nightmares from that.
>>>
>>
>> Could you please give some example for that?
>> Git is so easy to learn and use, that is is possible that it could be
>> your "incompetence" which created your nightmares. "Incompetence"
>> could have many meanings, good and bad ones. But, as an outsider who
>> follows discussions on the Boost mailing list, what I can see in
>> this thread is that people arguing in favour of Git mostly use
>> concrete arguments, supported by apparently quite some work done
>> regarding the Boost-Git connection, while people arguing against it
>> do not seem to present arguments, but mostly only negative emotions.
>> Like the statement above --- where is some evidence?
>
> Well the evidence is hard ... but let me try to replay my experience. I
> am sure, the next guy will step up and tell me that i did it totally
> wrong (actually happened when i tried to collaborate on said project
> using git).
>
> So, the journey starts about a year ago or so. I decided i need to check
> out this new project i heard about. I was (actually still am) very
> determined to contribute to that project, so i cloned the repository,
> browsed the code etc. eventually i decided to fork this project cause i
> wanted to get some hacking done. That is what i did. Then life happened
> and i had to postpone the work on the project.
> A few months later, I got a new assignment to contribute a module for
> that project. Remember, i still got that (public) fork lying around.
> So i tried to get it up to date. First bummer. I don't remember which
> commands i tried in which order, but merge didn't really work, and i

You should have used rebase to refresh your repository, not merge :)

Also when things are really starting to look bad, your best help are two 
commands "git reflog" and "git reset --hard" :)

B.