develooper Front page | perl.perl5.porters | Postings from December 2017

Re: Revisiting smart match

Thread Previous | Thread Next
Sawyer X
December 18, 2017 13:18
Re: Revisiting smart match
Message ID:

On 12/18/2017 02:56 PM, Dave Mitchell wrote:
> On Sun, Dec 17, 2017 at 10:51:35PM +0000, Zefram wrote:
>> Father Chrysostomos wrote:
>>> You did not rebase your branch.
>> Yes.  I know a rebase and trivial merge is preferred, but in this
>> case it would have been terribly time-consuming to rebase correctly.
>> Resolving the conflicts just once, in the merge, was the practical way.
> Please don't do this. For one thing, its against the current policy
> ('On merging and rebasing' in perlgit.pod).
> For another, it means that the merge commit potentially contains 'hidden'
> changes that are hard to view and review.

From my experience, reverting anything also becomes complicated as a
result of this.

Thread Previous | Thread Next Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at | Group listing | About