Add Halo to my Rom

J

jamesajohnson

Member

Dec 20, 2013

5

0

• Dec 20, 2013

• #1

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

Senior Member

Sep 6, 2011

3,319

1,036

Amsterdam

• Dec 20, 2013

• #2

The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk

 

J

jamesajohnson

Member

Dec 20, 2013

5

0

• Dec 20, 2013

• #3

SMillerNL said:

The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk

Click to expand...

Click to collapse

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.

 

J

jamesajohnson

Member

Dec 20, 2013

5

0

• Dec 20, 2013

• #4

SMillerNL said:

The key word is "cherry-pick"... Google that.

Sent from my Nexus 4 using Tapatalk

Click to expand...

Click to collapse

Used git fetch, then tried git merge but got "Automatic merge failed; fix conflicts and then commit the result."

 

SMillerNL

Senior Member

Sep 6, 2011

3,319

1,036

Amsterdam

• Dec 20, 2013

• #5

jamesajohnson said:

Used git fetch, then tried git merge but got "Automatic merge failed; fix conflicts and then commit the result."

Click to expand...

Click to collapse

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

 

J

jamesajohnson

Member

Dec 20, 2013

5

0

• Dec 20, 2013

• #6

SMillerNL said:

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

Click to expand...

Click to collapse

Bit what is a conflict? sorry I'm very new to git. I'll look in to fixing them later tonight

 

SMillerNL

Senior Member

Sep 6, 2011

3,319

1,036

Amsterdam

• Dec 20, 2013

• #7

jamesajohnson said:

Bit what is a conflict? sorry I'm very new to git. I'll look in to fixing them later tonight

Click to expand...

Click to collapse

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

 

J

jamesajohnson

Member

Dec 20, 2013

5

0

• Dec 20, 2013

• #8

SMillerNL said:

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

Click to expand...

Click to collapse

Thanks...

 

N

nvan7891

Senior Member

Jan 9, 2012

90

38

• May 23, 2014

• #9

jamesajohnson said:

Thanks...

Click to expand...

Click to collapse

Lol. Jeus, what a ****... Sorry, man.

I'd help you out, but seeing as this thread is almost 6 months old, I'm guesing you've figured it out, so I won't bother. Still, I just had to aknowledge the douchery, good lord...

 

xda Santhosh

Account Currently Disabled

May 10, 2014

125

29

Android forums

• May 24, 2014

• #10

Thanks for alll ......... Poster's