Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
Hi all, Just a word of warning, if you are going to merge two branches together, make sure to run "git pull --rebase" before you conduct the merge. Once you have conducted the merge, use "git pull" if you encounter a non-fast forward error. Do not run "git pull --rebase" after performing the merge

Re: Usage of pull rebasing and merges

2011-02-08 Thread Sebastian Trüg
Hi Ben, could you please elaborate on this. I do not understand the problem at all. What is so bad about rebasing and what is wrong with the commit you mention? Cheers, Sebastian On 02/08/2011 09:20 AM, Ben Cooksley wrote: > Hi all, > > Just a word of warning, if you are going to merge two bran

Re: Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: > Hi Ben, > > could you please elaborate on this. I do not understand the problem at > all. What is so bad about rebasing and what is wrong with the commit you > mention? > > Cheers, > Sebastian Hi Sebastian, The problem in this case isn't re

Re: Usage of pull rebasing and merges

2011-02-08 Thread David Jarvie
On Tue, February 8, 2011 9:08 am, Ben Cooksley wrote: > On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >> Hi Ben, >> >> could you please elaborate on this. I do not understand the problem at >> all. What is so bad about rebasing and what is wrong with the commit you >> mention? >> >> Cheers

Re: Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
On Tue, Feb 8, 2011 at 10:19 PM, David Jarvie wrote: > On Tue, February 8, 2011 9:08 am, Ben Cooksley wrote: >> On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >>> Hi Ben, >>> >>> could you please elaborate on this. I do not understand the problem at >>> all. What is so bad about rebasing a

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-08 Thread David Faure
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100516/#review1305 --- Ship it! Looks good, but... kio/kio/job.cpp

Re: Usage of pull rebasing and merges

2011-02-08 Thread Oswald Buddenhagen
On Tue, Feb 08, 2011 at 09:20:55PM +1300, Ben Cooksley wrote: > Do not run "git pull --rebase" after performing the merge, under any > circumstances. > ding ding ding - bingo! On Wed, Feb 02, 2011 at 10:27:02AM +0100, Oswald Buddenhagen wrote: > and remember that following receipes does *not* wor

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

2011-02-08 Thread Boudewijn Rempt
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 w

Re: Review Request: User-friendly error messages in Solid

2011-02-08 Thread Lukáš Tinkl
Dne Po 7. února 2011 20:43:05 todd rme napsal(a): > 2011/2/7 Lukáš Tinkl > > >This is an automatically generated e-mail. To reply, visit: > > http://git.reviewboard.kde.org/r/100603/ > > > > Review request for kdelibs, Pino Toscano and Kevin Ottens. > > > > By Lukáš Tinkl. > > Description

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

2011-02-08 Thread Alexander Neundorf
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 res

Re: Usage of pull rebasing and merges

2011-02-08 Thread Sebastian Trüg
Hi Ben, thanks for clarifying. :) Another point to add to my growing list of git tips. Cheers, Sebastian On 02/08/2011 10:08 AM, Ben Cooksley wrote: > On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >> Hi Ben, >> >> could you please elaborate on this. I do not understand the problem at >>

Re: Merge or Cherry-Pick?

2011-02-08 Thread Nicolás Alvarez
On 03/02/2011, Johannes Sixt wrote: > Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: >> So I git cloned KDE/4.6 into some local branch (git checkout KDE/4.6; git >> checkout -b toolbuttons), then fix, then test. >> >> Now I want to merge to the KDE/4.6 branch; thats easy. >> >> Then I want to m

Re: Usage of pull rebasing and merges

2011-02-08 Thread Christoph Feck
> > oh, well. i give up. I don't want to. Not yet. But the more I read here, the more confused I get. Christoph Feck (kdepepo)

Re: Usage of pull rebasing and merges

2011-02-08 Thread Wolfgang Rohdewald
On Dienstag 08 Februar 2011, Christoph Feck wrote: > I don't want to. Not yet. But the more I read here, the more > confused I get. the book "Pro Git" was/is very helpful for me and easy to read. However my copy from 2009 does not mention rerere yet http://progit.org/2010/03/08/rerere.html -- W

Re: Merge or Cherry-Pick?

2011-02-08 Thread Ian Monroe
2011/2/8 Nicolás Alvarez : > On 03/02/2011, Johannes Sixt wrote: >> Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: >> Before anybody begins to work in this way, someone with sufficient >> knowlege must introduce the first real merge of the 4.6 branch into the >> master branch. The conflicts mus

Re: git clone kde:kde-workspace hangs

2011-02-08 Thread Ian Monroe
On Mon, Feb 7, 2011 at 16:29, Martin Koller wrote: > On Sunday, 6. February 2011 23:54:07 Thiago Macieira wrote: >> On Sunday, 6 de February de 2011 16:48:21 Shaun Reich wrote: >> > On Sun, Feb 6, 2011 at 4:30 PM, Martin Koller wrote: >> > > Hi, >> > > >> > > I've tried already several times toda

Review Request: Clearing scrollback and resetting does not present a new prompt

2011-02-08 Thread José Manuel Santamaría Lema
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100611/ --- Review request for Konsole. Summary --- Hi, I can reproduce bug #242

GSoC ideas needed - 20 days until org application - last call

2011-02-08 Thread Lydia Pintscher
Heya folks :) We have 20 days left until org application opens for GSoC 2011. By that point we should have as many rocking ideas as possible on this wiki page: http://community.kde.org/GSoC/2011/Ideas It will be used to evaluate our application. Please add your ideas. It'd be awesome if we could

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-08 Thread Dawit Alemayehu
> On Feb. 8, 2011, 10:05 a.m., David Faure wrote: > > kio/kio/job.cpp, line 1639 > > > > > > Shouldn't there be a kio_http patch to go along with this? Otherwise > > the post data size is not used. Or was that just

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-08 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100516/ --- (Updated Feb. 9, 2011, 1:28 a.m.) Review request for kdelibs. Changes --