FORUMS

Introducing Voices of XDA: Have Your Ideas Heard

By far the greatest assets we have at XDA-Developers are you, the developers, the eager … more

Unofficial Xposed For Lollipop Touchwiz With Flashable Zip

XDA Recognized Developer arter97 has released an unofficial build … more

YotaPhone 2 Pre-Order, Xperia Z1 Price Cut – XDA TV

Android Wear 5.1.1 OTA downloads are now available. That and much more news is … more

[FTF] Sony Xperia Z Lollipop Release

Sony rolled out a Lollipop update for Xperia Z just yesterday. If you still haven’t gotten … more
Post Reply Subscribe to Thread Email Thread

Merging HALO code?

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: 566
 
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