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

When	Who	Action	New State
2016-01-18	Harsh.atal	Give more information	Open
2016-01-22	Harsh.atal	Confirm	Solved

Bazaar

History of question #281123