[Digikam-devel] [Bug 304946] Merge Conflict in branch remotes/origin/development/3.0.0

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=304946

--- Comment #5 from Gilles Caulier <caulier.gilles at gmail.com> ---
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

-- 
You are receiving this mail because:
You are the assignee for the bug.