FORUMS

OnePlus 2 Announced: Specs, Price and Details

The OnePlus 2 has just had its Virtual Reality Launch event, and at the XDA Office we all … more

A Helpful Guide to Music Streaming Services

With the launch of Apple Music, music streaming services have recently gained a lot of … more

An Inside Look at the Redesign of Business Calendar

The much-acclaimed calendar app, Business Calendar, underwent a major design … more

New Android One Device Dead On Arrival

Today, Google announced the second generation of Android One devices, with the new Lava Pixel … more

Merging HALO code?

1,968 posts
Thanks Meter: 528
 
By ZacksBuilds, Senior Member on 20th January 2014, 10:55 PM
Post Reply Subscribe to Thread Email Thread
29th March 2014, 09:06 PM |#11  
fzr-r4's Avatar
Senior Member
Flag Berkeley
Thanks Meter: 75
 
More
thanks a million for the tips, jabza.

along with gedit, i use diffuse to compare files when merging:

http://sourceforge.net/projects/diffuse/files/diffuse/

it highlights differences between files, which makes merging and resolving conflicts a bit easier.
The Following User Says Thank You to fzr-r4 For This Useful Post: [ View ]
 
 
30th March 2014, 01:45 AM |#12  
Senior Member
Thanks Meter: 576
 
Donate to Me
More
Quote:
Originally Posted by fzr-r4

thanks a million for the tips, jabza.

along with gedit, i use diffuse to compare files when merging:

http://sourceforge.net/projects/diffuse/files/diffuse/

it highlights differences between files, which makes merging and resolving conflicts a bit easier.

I think Ubuntu and some other major Linux distros come with diff, which does the same thing and it's what I use. Its a little harder to use, though, as it outputs the differences in the terminal rather than a GUI.

But that's a good tip, I might have to take a look.

Sent from my Nexus 5
30th March 2014, 07:40 PM |#13  
fzr-r4's Avatar
Senior Member
Flag Berkeley
Thanks Meter: 75
 
More
oops, nevermind!
Last edited by fzr-r4; 30th March 2014 at 07:54 PM.
Post Reply Subscribe to Thread
Previous Thread Next Thread
Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes