On 2021-06-10 08:41:21+0200, Johannes Sixt <j6t@xxxxxxxx> wrote: > 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 > > 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
