[Kde-scm-interest] Re: Usage of pull rebasing and merges

[John Tapsell]

On 8 February 2011 18:27, Ian Monroe <ian at monroe.nu> wrote:
> On Tue, Feb 8, 2011 at 10:55, Alexander Neundorf <neundorf at kde.org> wrote:
>> On Tuesday 08 February 2011, Boudewijn Rempt wrote:
>>> On Tuesday 08 February 2011, Oswald Buddenhagen wrote:
>>> > > - just throw away the merge with git reset --hard HEAD~1 and redo it
>>> > >   after git pull-ing. preferably, you should have git rerere enabled,
>>> > >   so you won't have to repeat resolving any possible conflicts.
>>>
>>> Excuse my ignorance... But what is "git rerere"?
>>
>> These emails are a clear sign to me that we need recommended workflows of how
>> to do things...

Of course it looks complicated if you start looking at the possible
ways it can go wrong, and the advanced features.

But I have used git for more than two years now, and I still haven't
ever needed to merge.  Yes, you will make mistakes with git, but it's
extremely forgiving.  You can roll back to previous state at any
point.  You can't break your repository.

Just stick to  "git pull --rebase"   to fetch new commits from the
server, "git commit" to make new commits, and "git push origin master"
to push your changes back.  Then after a week of that you'll wonder
why on earth you were ever worried about it!  Then you can just play
about with the other commands if you want.

John