Unfair conflicts after merging

Asked by Harsh.atal on 2016-01-18

    I recently merged my branch with the parent branch. I got 120+ conflicts. I even got conflicts in files that I have never even OPENED. How come? Please help.

    This is the kind of conflict I am getting:
Text conflict in dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java

   which tantamounts to :

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java 2015-12-30 08:27:14 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java 2016-01-18 10:56:39 +0000
@@ -1,7 +1,9 @@
 package org.hisp.dhis.common;

+import java.util.List;
+
 /*
- * Copyright (c) 2004-2015, University of Oslo
+ * Copyright (c) 2004-2016, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,13 +36,19 @@
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.period.Period;
+<<<<<<< TREE
+=======
+import org.hisp.dhis.program.ProgramIndicator;
+import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
+>>>>>>> MERGE-SOURCE

 /**
  * @author Morten Olav Hansen <email address hidden>
  */
-public interface AnalyticalObjectStore<T extends BaseAnalyticalObject>
+public interface AnalyticalObjectStore<T extends AnalyticalObject>
     extends GenericIdentifiableObjectStore<T>
 {
+<<<<<<< TREE
     int countDataSetAnalyticalObject( DataSet dataSet );

     int countIndicatorAnalyticalObject( Indicator indicator );
@@ -52,4 +60,37 @@
     int countOrganisationUnitAnalyticalObject( OrganisationUnit organisationUnit );

     int countCategoryOptionGroupAnalyticalObject( CategoryOptionGroup categoryOptionGroup );
+=======
+ List<T> getAnalyticalObjects( Indicator indicator );
+
+ List<T> getAnalyticalObjects( DataElement dataElement );
+
+ List<T> getAnalyticalObjectsByDataDimension( DataElement dataElement );
+
+ List<T> getAnalyticalObjectsByDataDimension( TrackedEntityAttribute attribute );
+
+ List<T> getAnalyticalObjects( DataSet dataSet );
+
+ List<T> getAnalyticalObjects( ProgramIndicator programIndicator );
+
+ List<T> getAnalyticalObjects( Period period );
+
+ List<T> getAnalyticalObjects( OrganisationUnit organisationUnit );
+
+ List<T> getAnalyticalObjects( CategoryOptionGroup categoryOptionGroup );
+
+ int countAnalyticalObjects( Indicator indicator );
+
+ int countAnalyticalObjects( DataElement dataElement );
+
+ int countAnalyticalObjects( DataSet dataSet );
+
+ int countAnalyticalObjects( ProgramIndicator programIndicator );
+
+ int countAnalyticalObjects( Period period );
+
+ int countAnalyticalObjects( OrganisationUnit organisationUnit );
+
+ int countAnalyticalObjects( CategoryOptionGroup categoryOptionGroup );
+>>>>>>> MERGE-SOURCE
 }

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Harsh.atal
Solved:
2016-01-22
Last query:
2016-01-22
Last reply:
Harsh.atal (harsh-atal) said : #1

I have checked all revisions that I have been made for my branch. None of the revisions involve the file above(among many others) which has got a conflict.

Harsh.atal (harsh-atal) said : #2

Sorry , there was a revert among the commits which created this situation.