Open War for Open Android: Antitrust for Cyanogen?

Android and openness is something we talk about all the time, but the recent … more

What Do You Do with All of Your Old Photos?

Smartphone cameras have advanced so tremendously over the past few years that they have … more

Diving into the April 2015 Material Design Update

Before the release of Android 5.0 Lollipop, the Holo Design guidelines served as the … more

New Cyanogen Partnerships Bring Privacy Concerns

New Privacy concerns have emerged regarding Cyanogen’s latest announcements, … 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
 
426 posts
Join Date:Joined: Sep 2010
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: 559
 
512 posts
Join Date:Joined: Aug 2012
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
 
426 posts
Join Date:Joined: Sep 2010
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