[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kwrite-devel
Subject:    Re: VCS work flow?
From:       Christoph Cullmann <cullmann () absint ! com>
Date:       2014-02-26 13:39:06
Message-ID: 1056200302.1130888.1393421946222.JavaMail.zimbra () absint ! com
[Download RAW message or body]

My stance is here:

I don't care ;)

For me both things have benefits, if you rebase, you retain some more SVN-ish linear history,
if you merge-commit you retain the "this was done in parallel to that" information.

I have neither problems with rebased commits/pushs nor with merge-commits, I don't think they are noise,
given the level of commits we have (if we would have 100 merge commits a day, I would reconsider that).

Greetings
Christoph

----- Ursprüngliche Mail -----
> On Tuesday 25 February 2014 17:27:45 Matthew Woehlke wrote:
> > As I'm getting mixed responses via RB, I thought I'd ask here... What is
> > the preferred VCS work flow for kate.git these days, especially for long
> > commit chains covered by a single review request? Rebase or merge?
> > 
> > Some arguments for each:
> > 
> > - Rebase preserves linear history, which may be simpler to look at.
> > 
> > - Merging makes it clear what commits are covered by a review request
> > and preserves the commit where a commit chain was started.
> 
> 
> _I_ definitely prefer rebase as the new feature/bugfix is in one chunk in the
> history. How the feature was developed and in what time frame has usually no
> relevance. It was added to the public repository at one specific time and the
> change in that specific time is what is interesting to me :)
> 
> Regards,
>   Kåre
> 
> 
> 
> 
> _______________________________________________
> KWrite-Devel mailing list
> KWrite-Devel@kde.org
> https://mail.kde.org/mailman/listinfo/kwrite-devel
> 

-- 
----------------------------- Dr.-Ing. Christoph Cullmann ---------
AbsInt Angewandte Informatik GmbH      Email: cullmann@AbsInt.com
Science Park 1                         Tel:   +49-681-38360-22
66123 Saarbrücken                      Fax:   +49-681-38360-20
GERMANY                                WWW:   http://www.AbsInt.com
--------------------------------------------------------------------
Geschäftsführung: Dr.-Ing. Christian Ferdinand
Eingetragen im Handelsregister des Amtsgerichts Saarbrücken, HRB 11234
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel

[prev in list] [next in list] [prev in thread] [next in thread]