Cannot find the 'MERGE' option into KDevPlatform VCS support source code.

[Carlos Nihelton Santana de Oliveira]

Thanks, Aleix!

That was exactly what I did.
Also needed to add a virtual function mergeBranch(...) into
vcs/interfaces/ibranchmanager.h and in the git plugin itself, I impemented
it.

I just got curious why this functionality was not expected in the vcs
system source code. Would it be worthy to submit as a pull request or not?

At least for me it is useful and it's working out-of-the-box. Maybe you
guys have good ideas to improve it.

Rgds,
Carlos
Em 01/02/2016 08:41, "Aleix Pol" <aleixpol at kde.org> escreveu:

> On Sun, Jan 31, 2016 at 12:59 AM, Carlos Nihelton
> <carlosnsoliveira at gmail.com> wrote:
> > Hi All,
> >
> > I'm used to setup git as VCS for my projects and I started to use
> KDevelop a
> > few months ago. When I want to merge two different branches in my code
> base I
> > always do by hand, because I couldn't find a 'merge' option in KDevelop
> branch
> > manager.
> >
> > Today I decided to dig into KDevPlatform source code to see if I made any
> > mistake when I compiled KDevelop 4.90.91 and I still couldn't find
> anything
> > related to merging branches in the code.
> >
> > Did I miss anything? Should this 'merge' option exist? Or was it never
> > considered an option?
> >
> > I wrote something quickly just to perform basic merging, without further
> > checks. But I got curious why this is not considered even in
> vcs/interfaces/
> > ibranchingversioncontrol.h
>
> Hi Carlos,
> It could be included.  You can try to get it in
> vcs/dvcs/ui/branchmanager.cpp, it already
> has some of the functionalities, it can probably use a merge as well.
>
> Aleix
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20160201/6ce2174a/attachment.html>