Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Jun 10, 2021, 07:53 UTC
Message-ID: <YMHE5xuxN90HJepT@danh.dev>
In-Reply-To: <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org>

On 2021-06-10 08:41:21+0200, Johannes Sixt <j6t@kdbg.org> wrote:

Show 8 quoted lines

> Am 09.06.21 um 21:28 schrieb Felipe Contreras:
> > Virtually everyone is using it, and it's one of the first things we
> > teach newcomers in order to resolve conflicts efficiently.
> > 
> > Let's make it the default.
> 
> I tested diff3 style the VERY FIRST TIME the other day and was greated
> with the below. Needless to say that this change is a no-go from my POV.

I agree, despite using 3-way merging (with external tools) to resolve conflicts.

I prefer the current conflict style, aka no-diff3 conflict style.

-- Danh

Show 53 quoted lines

> 
> Without diff3:
> 
> <<<<<<< HEAD
>     CClustering ComputeSSLClusters(double threshPercent, const CDataInfo* scale) const override;
>     void ComputeDist(DistFunc distFunc, CDoubleArray& dist,
>         double& minDist, double& maxDist) const;
>     double EstimateNodeDist2() const override;
>     std::vector<double> EstimateNeighborMinDist() const override;
> =======
>     CClustering ComputeSSLClusters(double threshPercent,
>         const CDoubleArray& compWeights, const CDataInfo* scale) const override;
>     static void ComputeDist(const CNetNodeHolder& vecs, CDoubleArray& dist,
>         double& minDist, double& maxDist);
> >>>>>>> no-compweights-in-cnet 
> 
> With diff3:
> 
> <<<<<<< HEAD
>     CClustering ComputeSSLClusters(double threshPercent, const CDataInfo* scale) const override;
>     void ComputeDist(DistFunc distFunc, CDoubleArray& dist,
>         double& minDist, double& maxDist) const;
>     double EstimateNodeDist2() const override;
>     std::vector<double> EstimateNeighborMinDist() const override;
> ||||||| merged common ancestors
> <<<<<<<<< Temporary merge branch 1
>     CClustering ComputeSSLClusters(double threshPercent, const CDataInfo* scale) const override;
>     void ComputeDist(DistFunc distFunc, CDoubleArray& dist,
>         double& minDist, double& maxDist) const;
>     virtual void ComputeKNearest(int K, const double*,
>         Neighborhood& result) const;
> ||||||||| d261d9944
>     CClustering ComputeClusters(const double* dist, double threshold,
>         const CDataInfo* scale) const override;
>     virtual void ComputeDist(DistFunc distFunc, CDoubleArray& dist,
>         double& minDist, double& maxDist);
>     virtual void ComputeUMatrix();
>     virtual void ComputeKNearest(int K, const double*,
>         Neighborhood& result) const;
> =========
>     CClustering ComputeClusters(const double* dist, double threshold,
>         const CDataInfo* scale) const override;
>     virtual void ComputeDist(DistFunc distFunc, CDoubleArray& dist,
>         double& minDist, double& maxDist);
>     virtual void ComputeUMatrix();
> =======
>     CClustering ComputeSSLClusters(double threshPercent,
>         const CDoubleArray& compWeights, const CDataInfo* scale) const override;
>     static void ComputeDist(const CNetNodeHolder& vecs, CDoubleArray& dist,
>         double& minDist, double& maxDist);
> >>>>>>> no-compweights-in-cnet 
> 
> -- Hannes

-- 
Danh