5,603,729 Members 37,178 Now Online
XDA Developers Android and Mobile Development Forum

Add Halo to my Rom

Tip us?
 
jamesajohnson
Old
#1  
Junior Member - OP
Thanks Meter 0
Posts: 5
Join Date: Dec 2013
Default Add Halo to my Rom

I successfully built the cm 10.2 source the other night and flashed it to my devices. I've also seen that the Paranoid Android team made Halo open source and anyone can add it to their ROM using Git. I have found the two commits that I need to merge with my source code but I have no idea how, I've tried google and searching through guides but nothing is working. Please can some one give me a start on how to do this?

Thanks
 
SMillerNL
Old
#2  
SMillerNL's Avatar
Recognized Contributor
Thanks Meter 962
Posts: 3,003
Join Date: Sep 2011
Location: Lisse

 
DONATE TO ME
The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk

"I actually don't want any Thanks. I don't need to be Thanked, because I just want to make XDA a better place..."
http://team-fun.eu
 
jamesajohnson
Old
#3  
Junior Member - OP
Thanks Meter 0
Posts: 5
Join Date: Dec 2013
Quote:
Originally Posted by SMillerNL View Post
The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk
Thanks but that's what I've been trying. In the root directory of the source code (~/android/system/) I ran the command (git cherry-pick 518c329). It just tells me fatal: bad revision.
 
jamesajohnson
Old
#4  
Junior Member - OP
Thanks Meter 0
Posts: 5
Join Date: Dec 2013
Quote:
Originally Posted by SMillerNL View Post
The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk
Used git fetch, then tried git merge but got "Automatic merge failed; fix conflicts and then commit the result."
 
SMillerNL
Old
#5  
SMillerNL's Avatar
Recognized Contributor
Thanks Meter 962
Posts: 3,003
Join Date: Sep 2011
Location: Lisse

 
DONATE TO ME
Quote:
Originally Posted by jamesajohnson View Post
Used git fetch, then tried git merge but got "Automatic merge failed; fix conflicts and then commit the result."
So what's not to get? There are conflicts between your branch and the halo changes. Fix them and commit the results...

Sent from my Nexus 4 using Tapatalk

"I actually don't want any Thanks. I don't need to be Thanked, because I just want to make XDA a better place..."
http://team-fun.eu
 
jamesajohnson
Old
#6  
Junior Member - OP
Thanks Meter 0
Posts: 5
Join Date: Dec 2013
Quote:
Originally Posted by SMillerNL View Post
So what's not to get? There are conflicts between your branch and the halo changes. Fix them and commit the results...

Sent from my Nexus 4 using Tapatalk
Bit what is a conflict? sorry I'm very new to git. I'll look in to fixing them later tonight
 
SMillerNL
Old
#7  
SMillerNL's Avatar
Recognized Contributor
Thanks Meter 962
Posts: 3,003
Join Date: Sep 2011
Location: Lisse

 
DONATE TO ME
Quote:
Originally Posted by jamesajohnson View Post
Bit what is a conflict? sorry I'm very new to git. I'll look in to fixing them later tonight
There is no better word in the English language to describe conflict than that. You appear to need a dictionary more than the git man page... A conflict is a conflict.

Sent from my Nexus 4 using Tapatalk

"I actually don't want any Thanks. I don't need to be Thanked, because I just want to make XDA a better place..."
http://team-fun.eu
 
jamesajohnson
Old
#8  
Junior Member - OP
Thanks Meter 0
Posts: 5
Join Date: Dec 2013
Quote:
Originally Posted by SMillerNL View Post
There is no better word in the English language to describe conflict than that. You appear to need a dictionary more than the git man page... A conflict is a conflict.

Sent from my Nexus 4 using Tapatalk
Thanks...

Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes


XDA PORTAL POSTS

When Using GitHub, Don’t Skimp on Commit History

GitHub has become the epicenter of most open source development work that is posted … more

Verizon Droid DNA to Receive 4.4.2 KitKat + Sense 5.5 OTA This Thursday

The HTC Droid DNAis Verizon’s close cousin to the JapaneseHTC … more

Lucid Browser is Small, Lightweight, and Open Source

If there is one application category that certainly isn’t lacking in Android,and … more