Go Back   Scooter Forums > Beyond Compare 3 Discussion > Version Control
Register FAQ Search Today's Posts Mark Forums Read

 
 
Thread Tools Display Modes
Prev Previous Post   Next Post Next
  #1  
Old 07-Jul-2010, 10:52 AM
Dan Ryan Dan Ryan is offline
New User
 
Join Date: Jul 2010
Posts: 1
Default Merging GIT files

I am having problems performing mysysgit merges using beyond compare. I have followed the instructions on the website for configuring git to use BC as a merge tool. When I run the tool it says "Error Opening File" in both the top middle (base) window and the bottom (output) window. If I look on the file system there is a .BACKUP a .LOCAL and a .REMOTE file. There is no base file. If I open the bottom file (which fails to open in BC) in notepad then it is like the original file but with the >>>>>> markers. I suspect that the configuration instructions were based on a older version of GIT? Can somebody please help me configure the mergetool correctly?
Reply With Quote
 

Tags
git, merge

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Forum Jump


All times are GMT -6. The time now is 08:11 AM.


Powered by vBulletin® Version 3.7.1
Copyright ©2000 - 2013, Jelsoft Enterprises Ltd.