Attend XDA's Second Annual Developer Conference, XDA:DevCon 2014!
5,785,935 Members 52,985 Now Online
XDA Developers Android and Mobile Development Forum

Merging HALO code?

Tip us?
 
fzr-r4
Old
#11  
fzr-r4's Avatar
Senior Member
Thanks Meter 75
Posts: 425
Join Date: Sep 2010
Location: Berkeley
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: [ Click to Expand ]
 
jabza
Old
#12  
Senior Member
Thanks Meter 531
Posts: 512
Join Date: Aug 2012

 
DONATE TO ME
Quote:
Originally Posted by fzr-r4 View Post
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
Nexus 5: Personal Paranoid Android nightly build
HTC One: Paranoid Android official beta
Samsung Infuse 4g: Beanstalk
====================================
My personal nightly builds from Paranoid Android source

With Halo: Nightly folder
Without Halo: Nightly folder

Also, you can check out the thread for updates and info.
Donate Bitcoins
 
fzr-r4
Old
(Last edited by fzr-r4; 30th March 2014 at 07:54 PM.)
#13  
fzr-r4's Avatar
Senior Member
Thanks Meter 75
Posts: 425
Join Date: Sep 2010
Location: Berkeley
oops, nevermind!
Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes