git mergetool

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

git mergetool

Alexander Remen
Hi,

Is it possible to set up SmartGit or just SmartGit's conflict solver as  
the default merge tool for git? I often do interactive rebases via command  
line and when I have lots of conflicts it would be nice to be able to open  
SmartGit via 'git mergetool'.

BR
--
Alexander Remen
Opera Software
Reply | Threaded
Open this post in threaded view
|

Re: git mergetool

Prakash Nadar
Yeah, I would like to have this feature enabled as well.

Thanks,
-prakash

From: Alexander Remen <[hidden email]<mailto:[hidden email]>>
Reply-To: "[hidden email]<mailto:[hidden email]>" <[hidden email]<mailto:[hidden email]>>
Date: Wed, 8 Jun 2011 08:13:23 -0700
To: "[hidden email]<mailto:[hidden email]>" <[hidden email]<mailto:[hidden email]>>
Subject: [smartgit] git mergetool



Hi,

Is it possible to set up SmartGit or just SmartGit's conflict solver as
the default merge tool for git? I often do interactive rebases via command
line and when I have lots of conflicts it would be nice to be able to open
SmartGit via 'git mergetool'.

BR
--
Alexander Remen
Opera Software




[Non-text portions of this message have been removed]

Reply | Threaded
Open this post in threaded view
|

Re: git mergetool

syntevo Support
In reply to this post by Alexander Remen
You should be able to configure SmartSynchronize

<http://www.syntevo.com/smartsynchronize/download.html>

as merge tool.

--
Best regards,
Thomas Singer
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com





06/08/2011 17:40 - Alexander Remen wrote:

> Hi,
>
> Is it possible to set up SmartGit or just SmartGit's conflict solver as  
> the default merge tool for git? I often do interactive rebases via command  
> line and when I have lots of conflicts it would be nice to be able to open  
> SmartGit via 'git mergetool'.
>
> BR
> --
> Alexander Remen
> Opera Software
>
Reply | Threaded
Open this post in threaded view
|

Re: git mergetool

Prakash Nadar
Haven't I paid for those features already with SmartGit? it is just a matter of launching them from command line.

-prakash

From: syntevo Support <[hidden email]<mailto:[hidden email]>>
Reply-To: "[hidden email]<mailto:[hidden email]>" <[hidden email]<mailto:[hidden email]>>
Date: Wed, 8 Jun 2011 11:35:53 -0700
To: "[hidden email]<mailto:[hidden email]>" <[hidden email]<mailto:[hidden email]>>
Subject: Re: [smartgit] git mergetool



You should be able to configure SmartSynchronize

<http://www.syntevo.com/smartsynchronize/download.html>

as merge tool.

--
Best regards,
Thomas Singer
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com

06/08/2011 17:40 - Alexander Remen wrote:

> Hi,
>
> Is it possible to set up SmartGit or just SmartGit's conflict solver as
> the default merge tool for git? I often do interactive rebases via command
> line and when I have lots of conflicts it would be nice to be able to open
> SmartGit via 'git mergetool'.
>
> BR
> --
> Alexander Remen
> Opera Software
>




[Non-text portions of this message have been removed]



------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartgit/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartgit/join
    (Yahoo! ID required)

<*> To change settings via email:
    [hidden email]
    [hidden email]

<*> To unsubscribe from this group, send an email to:
    [hidden email]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/