Unfair conflicts after merging
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/
which tantamounts to :
=== modified file 'dhis-2/
--- dhis-2/
+++ dhis-2/
@@ -1,7 +1,9 @@
package org.hisp.
+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.
import org.hisp.
import org.hisp.
+<<<<<<< TREE
+=======
+import org.hisp.
+import org.hisp.
+>>>>>>> MERGE-SOURCE
/**
* @author Morten Olav Hansen <email address hidden>
*/
-public interface AnalyticalObjec
+public interface AnalyticalObjec
extends GenericIdentifi
{
+<<<<<<< TREE
int countDataSetAna
int countIndicatorA
@@ -52,4 +60,37 @@
int countOrganisati
int countCategoryOp
+=======
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ List<T> getAnalyticalOb
+
+ int countAnalytical
+
+ int countAnalytical
+
+ int countAnalytical
+
+ int countAnalytical
+
+ int countAnalytical
+
+ int countAnalytical
+
+ int countAnalytical
+>>>>>>> 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.