Bug 304946

Summary:	Merge Conflict in branch.
Product:	[Applications] digikam	Reporter:	Abhinav Badola <mail.abu.to>
Component:	Portability-Runtime	Assignee:	Digikam Developers <digikam-bugs-null>
Status:	RESOLVED NOT A BUG
Severity:	critical	CC:	caulier.gilles, wazery
Priority:	NOR
Version:	3.0.0
Target Milestone:	---
Platform:	openSUSE
OS:	Linux
Latest Commit:		Version Fixed In:	7.6.0
Sentry Crash Report:

Description Abhinav Badola 2012-08-10 21:18:02 UTC

I need to work on some details of Video Metadata feature, but due to merge failure, I am not able to compile the code.

Since I have written the files that are causing conflict, I am not sure how to resolve this merge conflict.
Please help.

Reproducible: Always

Steps to Reproduce:
1. git checkout master
2. git pull --rebase
3. git checkout 3.0.0
4. git pull
5. git merge master
Actual Results:  
Auto-merging utilities/setup/setupplugins.h
CONFLICT (modify/delete): utilities/cameragui/views/importview.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importview.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/views/importview.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importview.cpp left in tree.
Removing utilities/cameragui/views/importthumbnailbar.h
Removing utilities/cameragui/views/importthumbnailbar.cpp
CONFLICT (modify/delete): utilities/cameragui/views/importstackedview.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importstackedview.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/views/importstackedview.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importstackedview.cpp left in tree.
Removing utilities/cameragui/views/importsettings.h
Removing utilities/cameragui/views/importsettings.cpp
CONFLICT (modify/delete): utilities/cameragui/views/importpreviewview.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importpreviewview.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/views/importpreviewview.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importpreviewview.cpp left in tree.
Removing utilities/cameragui/views/importiconview_p.h
Removing utilities/cameragui/views/importiconview_p.cpp
CONFLICT (modify/delete): utilities/cameragui/views/importiconview.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importiconview.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/views/importiconview.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importiconview.cpp left in tree.
Removing utilities/cameragui/views/importcategorizedview_p.h
CONFLICT (modify/delete): utilities/cameragui/views/importcategorizedview.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importcategorizedview.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/views/importcategorizedview.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/views/importcategorizedview.cpp left in tree.
Auto-merging utilities/cameragui/views/cameraiconview.h
Auto-merging utilities/cameragui/views/cameraiconview.cpp
CONFLICT (modify/delete): utilities/cameragui/models/importthumbnailmodel.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/models/importthumbnailmodel.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/models/importthumbnailmodel.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/models/importthumbnailmodel.cpp left in tree.
Removing utilities/cameragui/models/importmodel.h
Removing utilities/cameragui/models/importmodel.cpp
CONFLICT (modify/delete): utilities/cameragui/models/importimagemodel.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/models/importimagemodel.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/models/importimagemodel.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/models/importimagemodel.cpp left in tree.
Removing utilities/cameragui/models/importfiltermodel.h
CONFLICT (modify/delete): utilities/cameragui/models/importfiltermodel.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/models/importfiltermodel.cpp left in tree.
Removing utilities/cameragui/models/camitemsortsettings.h
Removing utilities/cameragui/models/camitemsortsettings.cpp
Auto-merging utilities/cameragui/main/cameraui_p.h
CONFLICT (content): Merge conflict in utilities/cameragui/main/cameraui_p.h
Auto-merging utilities/cameragui/main/cameraui.rc
CONFLICT (content): Merge conflict in utilities/cameragui/main/cameraui.rc
Auto-merging utilities/cameragui/main/cameraui.h
CONFLICT (content): Merge conflict in utilities/cameragui/main/cameraui.h
Auto-merging utilities/cameragui/main/cameraui.cpp
CONFLICT (content): Merge conflict in utilities/cameragui/main/cameraui.cpp
Removing utilities/cameragui/items/itemviewimportdelegatepriv.h
Removing utilities/cameragui/items/itemviewimportdelegate.h
Removing utilities/cameragui/items/itemviewimportdelegate.cpp
Removing utilities/cameragui/items/importtooltipfiller.cpp
Removing utilities/cameragui/items/importdelegatepriv.h
CONFLICT (modify/delete): utilities/cameragui/items/importdelegate.h deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/items/importdelegate.h left in tree.
CONFLICT (modify/delete): utilities/cameragui/items/importdelegate.cpp deleted in master and modified in HEAD. Version HEAD of utilities/cameragui/items/importdelegate.cpp left in tree.
Removing utilities/cameragui/items/importcategorydrawer.h
Removing utilities/cameragui/items/importcategorydrawer.cpp
Auto-merging utilities/cameragui/items/cameraiconitem.h
Auto-merging utilities/cameragui/items/cameraiconitem.cpp
Auto-merging utilities/cameragui/controller/cameracontroller.cpp
CONFLICT (content): Merge conflict in utilities/cameragui/controller/cameracontroller.cpp
Auto-merging utilities/cameragui/CMakeLists.txt
CONFLICT (content): Merge conflict in utilities/cameragui/CMakeLists.txt
Removing libs/threads/dweaverobserver.h
Removing libs/threads/dweaverobserver.cpp
Removing libs/threads/dactionthreadbase.h
Removing libs/threads/dactionthreadbase.cpp
Automatic merge failed; fix conflicts and then commit the result.

Expected Results:  
Successful Recursive merge.

Comment 1 Islam Wazery 2012-08-11 09:34:19 UTC

The correct branch is development/3.0.0 not origin/development/3.0.0, please if development/3.0.0 works for you inform me here.

Comment 2 Abhinav Badola 2012-08-11 14:11:39 UTC

(In reply to comment #1)
> The correct branch is development/3.0.0 not origin/development/3.0.0, please
> if development/3.0.0 works for you inform me here.

Sorry, my mistake.

I am on branch development/3.0.0

I have been working on the branch prior to this also.
And it is producing merge conflict with master.

Please do check it.

Comment 3 Islam Wazery 2012-08-12 00:40:31 UTC

Sorry Abhinav, but I am not working with the master branch. You can ask Gilles about that, I will CC him.

Comment 4 Abhinav Badola 2012-08-12 00:47:29 UTC

(In reply to comment #3)
> Sorry Abhinav, but I am not working with the master branch. You can ask
> Gilles about that, I will CC him.

Sure.

Comment 5 caulier.gilles 2012-08-12 06:41:29 UTC

What's the "git branch -a" give in your local source repository ?

Note you don't need to do merge. I do it myself between master and 3.0.0 branch.

Typically, we need to sync 3.0.0 branch with git /master to include last fix from master to 3.0.0. Currently, there is nothing to sync. 2.8.0 have been released, and no fix have been included to master to backport in 3.0.0.

It sound like you try to do the inverse... no ? (3.0.0 to master) I already fixed something like that few days ago. I posted a messagein digikam-devel-soc ML...

Gilles

Comment 6 caulier.gilles 2012-08-12 06:49:18 UTC

Well, it's reproducible here too... I don't know why. It sound like a problem occurs since i fixed master few day ago (3.0.0 have been backported to master by accident - thanks git to be too complicated...)

Forget to sync 3.0.0 with master for the moment. I will investiguate with Marcel when he will back from hollidays.

Gilles Caulier

Comment 7 caulier.gilles 2012-08-12 06:50:34 UTC

Note : restore your 3.0.0 branch using "git reset --hard" and continue to work as expected...

Gilles Caulier

Comment 8 caulier.gilles 2013-11-25 12:10:08 UTC

In all case, i close this file.

Develpement thread must go to digikam-devel ML, not bugzilla...

Gilles Caulier