Related
edit: problem solved, patch attached. i also made an update.zip with the new kernel, see here.
there is a vncserver for android out there. so far it works fine, but there is no keyboard or mouse control for the host (android). this being a kernel limitation it can be patched. unluckily for us the patch is available only for the magic kernel version 2.6.23, not for the hero kernel version 2.6.27. i would kindly ask all the developers out there to have a look at the links below, and at least comment about the possibility to "port" (don't know the right expression) the patch to the heros kernel, or teknologists version. i can do the compiling and testing myself, just need someone to have a look at the patch, this is way beyond my skills for now. just compiled the teknologist kernel successfully, as my first compiled kernel ever!
the vncserver project
the patch
htc kernel source
teknologist kerne git
thank you in advance.
i think i managed to apply the patch manually, once i looked into it it turned out that there where only a few lines in 3 files, plus one completely new file, so it seemed pretty easy. yet to be tested, but first i figure out why the kernel won't boot at all, not even with teks sources...
so stay tuned for the kkernel, with full vnc support!
kendong2 said:
i think i managed to apply the patch manually, once i looked into it it turned out that there where only a few lines in 3 files, plus one completely new file, so it seemed pretty easy. yet to be tested, but first i figure out why the kernel won't boot at all, not even with teks sources...
so stay tuned for the kkernel, with full vnc support!
Click to expand...
Click to collapse
I thought Tek's kernel was based on the GSM hero kernel, not the CDMA one, which might be one of the reasons.
thecodemonk said:
I thought Tek's kernel was based on the GSM hero kernel, not the CDMA one, which might be one of the reasons.
Click to expand...
Click to collapse
uhm, i have only the gsm hero, no cdma in germay...
anyway, i forgot the --base 0x19200000 in my script, so the boot.img was faulty. it is working now, fbvncserver recieves keyboard inputs, but mouse does not do anything
maybe i can figure that out somehow, already posted in google code of the project.
i will release an update.zip this afternoon, containing the kernel and fbvncserver for easy installation, but now i gotta get some sleep
kendong2 said:
i will release an update.zip this afternoon, containing the kernel and fbvncserver for easy installation, but now i gotta get some sleep
Click to expand...
Click to collapse
who needs sleep anyway here's the kkernel-1.0
could one of the mods please set a [SOLVED] in front of the titel? if i am supposed to do this myself please tip me of how, i don't get it...
Great work. Will you share the Patch ?
kendong2 said:
could one of the mods please set a [SOLVED] in front of the titel? if i am supposed to do this myself please tip me of how, i don't get it...
Click to expand...
Click to collapse
You can do it editing your first post
i will, was going to do it tonight anyway, please be patient for a few more hours...
Lox_Dev said:
Great work. Will you share the Patch ?
You can do it editing your first post
Click to expand...
Click to collapse
patch is there. thx, i think i forgot to click on "go advanced" when i tried...
kendong2 said:
patch is there. thx, i think i forgot to click on "go advanced" when i tried...
Click to expand...
Click to collapse
Great thks a lot for the patch. I'll apply it to next community kernel release.
There's a fork of android-vnc that works without patching, android-vnc-server (both kbde and touch events).
rejser said:
There's a fork of android-vnc that works without patching, android-vnc-server (both kbde and touch events).
Click to expand...
Click to collapse
lol although it makes my work on the patch completely obsolete it sounds really good. i will look into that this evening, thanks for the hint.
nevertheless, it was interesting to find out how kernel-compiling and cross-compiling works, i actually had fun doing it
too bad, doesn't work for me
console output shows that keys are received, but no action
rejser said:
There's a fork of android-vnc that works without patching, android-vnc-server (both kbde and touch events).
Click to expand...
Click to collapse
thx for the hint, doesn't work for me either though... gonna try it with another kernel, but not before next week, having the gf over the weekend... no kernel baking then
You can discuss about the nightly builds which you can find on the link below here!
http://buildbot.teamdouche.net/nightly/hero/
maxisma said:
You can find nightly builds of CyanogenMod 6 here (compiled daily) here:
ftp://maxisma:[email protected]/
Flash this GApps package after the nightly build installation:
http://www.multiupload.com/9LJMNBHOXF
Have fun
Click to expand...
Click to collapse
is this a better version then lox yesterday released? or the same..?
Let's try it
incomer said:
is this a better version then lox yesterday released? or the same..?
Click to expand...
Click to collapse
It's newer, doesn't mean it's better.. but could be.
ok, dowloading now =D!
Thanks..
Maxisma, if i understand correctly, you and Lox are working together to create CM6?
Not too sure what the "nightly" naming gives out, but imo (and i mean no offence) it would be better if you had one thread and updated the first post, until we get to a beta phase.
my 2cents.
Thanks for your work.
petsasj said:
Maxisma, if i understand correctly, you and Lox are working together to create CM6?
Not too sure what the "nightly" naming gives out, but imo (and i mean no offence) it would be better if you had one thread and updated the first post, until we get to a beta phase.
my 2cents.
Thanks for your work.
Click to expand...
Click to collapse
Well, Lox does most of the work.
The naming "nightly" means that these are builds which are compiled automatically daily.
These builds can be more stable, or less stable.
This is for the impatient guys within this community.
How is working peoples?
My Hero is in a shop now it is searching for a new owner...
Runs pretty nice so far. I had 1 random reboot tho. Thnx for your work!
Flashed over the top of Loxs' version and so far so good.
Seems smoother and faster, but that may just be down to ' new rom flashed' syndrome ( ie, all in my head) lol
It's great to be on the CM bandwagon at last, I've been running AOSP rom's since january and froyo may help get a few more Sense addicts cured ;-)
Does this ROM need a specific radio? As I'm currently on VillainROM10.2, it should be fine right? Just wipe and flash?
Great work to everyone working on Froyo,
I suspect everything works including camera?
you suspect wrong ;p
lots of thanks for sharing
Here is a Mirror for GAPPS - as that one above on rapidshare has expired.
http://rapidshare.com/files/404934792/gapps-passion-FRF83-signed.zip.html <---from a premium account and therefore will not expire
Any plans when camera is going to work? Or may be it IS already working?
Just wondering: Is it okay to flash the nightlies over the current ROM (without wiping etc..), and will there be changelogs?
Thanks.
XeoNiCaLiTy said:
Just wondering: Is it okay to flash the nightlies over the current ROM (without wiping etc..), and will there be changelogs?
Thanks.
Click to expand...
Click to collapse
It is ok. Nope there won't be changelogs, as everything is automated.
maxisma said:
It is ok. Nope there won't be changelogs, as everything is automated.
Click to expand...
Click to collapse
Hi, does your Rom require a specific radio, or is fine to use any???
Thanks!
No Root through ADB?
Seems these builds have no root access through ADB. Apps do get access to root, but ADB seems messy.
adb shell works which ends up no root unless you "su".
adb remount doesnt work and mounting while su in the shell throws an error.
Hope this get's resolved
p.s. Had no such issues on the original test0 posted by lox
maxisma said:
Well, Lox does most of the work.
The naming "nightly" means that these are builds which are compiled automatically daily.
These builds can be more stable, or less stable.
This is for the impatient guys within this community.
Click to expand...
Click to collapse
I see, i'm very sorry for my post then. I thought that the name Nightly ought to be a name of somekind of release, not the actual meaning of the word.
That's a very nice feature, very thoughtful, so thank you.
petsasj said:
I see, i'm very sorry for my post then. I thought that the name Nightly ought to be a name of somekind of release, not the actual meaning of the word.
That's a very nice feature, very thoughtful, so thank you.
Click to expand...
Click to collapse
No problem
Okay so that we have a development topic (due to lack of a forum) for both phones which are basically the same.
What's going on the Galaxy W side:
Arco68 is porting CM9 to the phone
KezraPlanes is trying to port CM7 to the phone and making a custom stock ROM.
What's going on the Exhibit 2 side:
**placeholder text**
Try to keep general discussion to this topic I will post:
This will be a development topic.
So I was finally able to solve my issues with downloading the CM7 sources. Apparently it was in issue with the manifest.xml file which can be easily solved by doing this:
Add this in the beginning of the file where all the other equal references are:
<remote name="github-https"
fetch="https://github.com/"
review="review.cyanogenmod.com" />
Click to expand...
Click to collapse
And replace the original line near the end of the file with this:
<project path="prebuilt" name="CyanogenMod/android_prebuilt" remote="github-https" />
Click to expand...
Click to collapse
This fixes the download sources issue.
So r u gonna help us w/ cm9 an recovery
sent from my exhibit 2 greatness
KezraPlanes said:
So I was finally able to solve my issues with downloading the CM7 sources.
Click to expand...
Click to collapse
I'm not sure what issue you are referring to or what file ?
I have trouble with their instruction on the "building kernel from sources page"
repo init -u git://github.com/CyanogenMod/android.git -b gingerbread
repo sync -j8
is not working for me.
Do you suggest to modify the repo file or is that another procedure you are talking about ?
Nilpotent said:
I'm not sure what issue you are referring to or what file ?
I have trouble with their instruction on the "building kernel from sources page"
repo init -u git://github.com/CyanogenMod/android.git -b gingerbread
repo sync -j8
is not working for me.
Do you suggest to modify the repo file or is that another procedure you are talking about ?
Click to expand...
Click to collapse
dswaggz was referring to this thread for the Exhibit 2.
My Galaxy W should arrive any day now (*impatient*) and I have an Exhibit 2. I think it'll be easy to cooperate on developing for both phones. I don't see anything in your first post about what's already working. (The phone is rooted, but beyond that, if you have any updates I'll look at post #1 )
Is it ok to PM you?
Nilpotent said:
I'm not sure what issue you are referring to or what file ?
I have trouble with their instruction on the "building kernel from sources page"
repo init -u git://github.com/CyanogenMod/android.git -b gingerbread
repo sync -j8
is not working for me.
Do you suggest to modify the repo file or is that another procedure you are talking about ?
Click to expand...
Click to collapse
Depending on what error you are getting, it might work for you. It solved everything for me but I was using "repo sync -j16" (I was also following one tutorial from their wiki).
In my case the error made me unable to download the sources past 93%
Hi Guys,
Just have the phone for a week now, and i gotta say i really like this phone!
Had a LG Optimus Me before, but the Galaxy Wonder is so much more and better.
Hope there will be a CM 7 or 9 very soon.
Good luck with developping!
I was going to release a deodexed-rooted-arcokernel'd stock ROM today because I've figured out how to do it while helping Arco68 with ICS, but unfortunately the laptop I'm using right now (which is not the computer I use for dev'ing) corrupts the ROM everytime I build it.
I might bring back to my hometown (where I spend my weekends) my broken-screen laptop, connect it via HDMI to the TV in the living room and create the ROM there, since I have to go to my rented apartment to get some stuff anyway.
I'm aiming at a release tomorrow at the most.
Edit: I'm a ****ing idiot. I'm guessing it's going to work now,
Will it work for the exhibit 2
sent from my exhibit 2 greatness
The best of luck...make it work I would like to try it....BTW what will be required to flash it...ClockworkMod ?
Sent from my GT-I8150 using xda premium
Is there already a overclock kernel for our device?
Cheers, Gerard
TuxBrothers said:
Is there already a overclock kernel for our device?
Cheers, Gerard
Click to expand...
Click to collapse
Off course the heritage of CM7
Sent from my GT-I8150 using xda premium
andynroid said:
The best of luck...make it work I would like to try it....BTW what will be required to flash it...ClockworkMod ?
Sent from my GT-I8150 using xda premium
Click to expand...
Click to collapse
Any recovery.
The ROM is installing fine but apparently hangs. Apparently it's the Dalvik's fault, but I don't remember messing with it.
Gonna work a little on it today.
Hopefully it will work for my device here in Malaysia...Have attached my firmware SC
Sent from my GT-I8150 using xda premium
Sent from my GT-I8150 using xda premium
dswaggz said:
Will it work for the exhibit 2
sent from my exhibit 2 greatness
Click to expand...
Click to collapse
I can't promise anything, but from what I know, it should.
KezraPlanes said:
I was going to release a deodexed-rooted-arcokernel'd stock ROM today because I've figured out how to do it while helping Arco68 with ICS, but unfortunately the laptop I'm using right now (which is not the computer I use for dev'ing) corrupts the ROM everytime I build it.
I might bring back to my hometown (where I spend my weekends) my broken-screen laptop, connect it via HDMI to the TV in the living room and create the ROM there, since I have to go to my rented apartment to get some stuff anyway.
I'm aiming at a release tomorrow at the most.
Edit: I'm a ****ing idiot. I'm guessing it's going to work now,
Click to expand...
Click to collapse
Testing volunteer here
fender90 said:
Testing volunteer here
Click to expand...
Click to collapse
I'll second that, I need to jump back to stock on my T679 anyways so if you have any thing to test run before I do that feel free to let me know.
PS: woo first post!!!1!!111!!one
matt_6288 said:
I'll second that, I need to jump back to stock on my T679 anyways so if you have any thing to test run before I do that feel free to let me know.
PS: woo first post!!!1!!111!!one
Click to expand...
Click to collapse
@matt_6288: the T679 is the T-Mobile USA Exhibit II. KezraPlanes' ROM is for the Galaxy W (a.k.a. I8150). You can't use it as-is, but we're working on ROMs for both.
Well thanks to my mentor Arco68, I have my hands on the newest Samsung FW for the Galaxy W which makes me re-start my work from scratch. But now that I'm working on a decent computer, I should be able to do things much faster.
PSA - newest binaries released!
If anyone manages to extract them for TORO (or for magure/toroplus for that matter) and can build a flashble update zip, would you please post here? For some reason I can't extract the shell scripts...my ubuntu build must be shot. Source: https://developers.google.com/android/nexus/drivers#torojdq39
klobkelosh said:
PSA - newest binaries released!
If anyone manages to extract them for TORO (or for magure/toroplus for that matter) and can build a flashble update zip, would you please post here? For some reason I can't extract the shell scripts...my ubuntu build must be shot. Source: https://developers.google.com/android/nexus/drivers#torojdq39
Click to expand...
Click to collapse
I'm on a Windows machine and came across those on Google's site. I used a text editor to open the shell script and then deleted all lines above the binary data, then saved, then renamed the file with a .tar.gz extension. I could then open that and see all of the files. Try that.
Turns out I had a space on the file path! Thanks mmuzzy for pointing that out...
If anyone wants the TORO binaries as a flashable zip, here: http://d-h.st/fpN
Tested on cm 10.1 latest nightly. All ok. Even fixes a gps issue with cm.
Tiny did a few more tweaks. His version fixes the gps wakelock issue:
New link: URL=http://d-h.st/Lgo]422-JDQ39-toro-proprietaries.zip - 4.45 MB[/URL]
Tiny Pulled the file that caused dev-host to complain about a virus (fRom) that I originally included. Tiny can't find anything about this file so it's a false positive but to be sure, he uploaded a new zip and removed the old one
Thanks tiny!
Link fix
http://d-h.st/Lgo
Sent from my Galaxy Nexus using xda app-developers app
Maguro JB 4.2.2 JDQ39 Binaries
Hi guys!
Here's the Maguro JB 4.2.2 JDQ39 Binaries :good:
http://forum.xda-developers.com/showpost.php?p=38650434&postcount=2641
klobkelosh said:
PSA - newest binaries released!
If anyone manages to extract them for TORO (or for magure/toroplus for that matter) and can build a flashble update zip, would you please post here? For some reason I can't extract the shell scripts...my ubuntu build must be shot. Source: https://developers.google.com/android/nexus/drivers#torojdq39
Click to expand...
Click to collapse
I didn't know you were over here now :good:
CondemnedSoul said:
I didn't know you were over here now :good:
Click to expand...
Click to collapse
Hey hey cs! How you doing man?
Yeah, I've been over here since vzw gnex release day. You still deving?
klobkelosh said:
Hey hey cs! How you doing man?
Yeah, I've been over here since vzw gnex release day. You still deving?
Click to expand...
Click to collapse
Sweet.... I'm doing pretty good. Finally getting things in order with life. Yes, still deving.... just received a gnex yesterday. Checking things out over here and waiting on a sim card. Should have it Monday I think.
CondemnedSoul said:
Sweet.... I'm doing pretty good. Finally getting things in order with life. Yes, still deving.... just received a gnex yesterday. Checking things out over here and waiting on a sim card. Should have it Monday I think.
Click to expand...
Click to collapse
cool! Hoping you build for Toro!
I haven't pulled off my own ROM yet, but I've done a bunch of porting, theming, and tinkering, mostly for myself. See ya round!
Hi guys, can someone explain to me if these binaries are anything new for me if I previously installed Android 4.2.2 (JDQ39) factory image? Should I flash those new binaries now?
kamil.trebunia said:
Hi guys, can someone explain to me if these binaries are anything new for me if I previously installed Android 4.2.2 (JDQ39) factory image? Should I flash those new binaries now?
Click to expand...
Click to collapse
The binaries in this thread are for toro only. I wouldn't advise flashing them on maguro. There is a link to proper Gsm binaries a few posts back that can be flashed.
Sent from my Galaxy Nexus using Tapatalk 2
Nice.
Sent from my Paranoid Nexus 3.0
klobkelosh said:
cool! Hoping you build for Toro!
I haven't pulled off my own ROM yet, but I've done a bunch of porting, theming, and tinkering, mostly for myself. See ya round!
Click to expand...
Click to collapse
You should post them ... Don't be greedy! .... I will be soon
Sent from my ADR6400L using Tapatalk 2
kamil.trebunia said:
Hi guys, can someone explain to me if these binaries are anything new for me if I previously installed Android 4.2.2 (JDQ39) factory image? Should I flash those new binaries now?
Click to expand...
Click to collapse
Any factory image for the same android build will have the same binaries (and probably others that can't be distributed as open source) as the ones posted for aosp.
I pulled the GPS, Wi-Fi, and Bluetooth drivers from mwalt2's deodex of last night's ota leak: VZW_JDQ39_GPS+WIFI_DRIVERS.zip - 1.22 MB. Not sure if they are any different than the AOSP binaries, but here they are if you want them. Phone is deep sleeping like a baby, GPS locks right on, and Wi-Fi seems good.
klobkelosh said:
I pulled the GPS, Wi-Fi, and Bluetooth drivers from mwalt2's deodex of last night's ota leak: VZW_JDQ39_GPS+WIFI_DRIVERS.zip - 1.22 MB. Not sure if they are any different than the AOSP binaries, but here they are if you want them. Phone is deep sleeping like a baby, GPS locks right on, and Wi-Fi seems good.
Click to expand...
Click to collapse
Flashing these over Mmuzzy's 3/2 Vanilla build is ok?
n99hockey said:
Flashing these over Mmuzzy's 3/2 Vanilla build is ok?
Click to expand...
Click to collapse
Yes, should work fine.
Can these be flashed on a 4.1.2 ROM and get improvement?
Galaxy Nexus+Baked+Lean+TWRP=BOOM SHAKALAKA
TMFGO45 said:
Can these be flashed on a 4.1.2 ROM and get improvement?
Galaxy Nexus+Baked+Lean+TWRP=BOOM SHAKALAKA
Click to expand...
Click to collapse
Let us know after you flash it!
Hey there,
First if all, i'll explain what's in my head.
Use google's stock code for base, (Android 4.3)
Then add some features;
- Advanced Reboot Menu
- PA like "Clear All" button on Recents Menu
- Slim battery percentage
- Volume Rocker wake
For above those, i tried manual way but there are so many changes and humanity make the faults.
For this, i think if i migrate google's source code to my own github, and download it from github it will be easily to Cherry-pick and revert some kinda commits who makes errors.
I have a small info about building and editing. So please be clear.
So, how can i migrate googles source code for 4.3 to my github?
okanb3 said:
So, how can i migrate googles source code for 4.3 to my github?
Click to expand...
Click to collapse
https://help.github.com/articles/fork-a-repo
cupfulloflol said:
https://help.github.com/articles/fork-a-repo
Click to expand...
Click to collapse
I cant see any Fork option on google's page, can you help me?
okanb3 said:
I cant see any Fork option on google's page, can you help me?
Click to expand...
Click to collapse
uh....there isnt a 'fork' option because google hosts its own code, it doesnt use github....
have you sync'd the AOSP repo yet?
if you have, then you know you already have the source code ON your computer.
at that point, you can create a project on github and push your repo to it
Pirateghost said:
uh....there isnt a 'fork' option because google hosts its own code, it doesnt use github....
have you sync'd the AOSP repo yet?
if you have, then you know you already have the source code ON your computer.
at that point, you can create a project on github and push your repo to it
Click to expand...
Click to collapse
My upload speed is 80kb/sn. Pushing all of things takes nearly weeks, i guess.
Any suggestion?
Pirateghost said:
uh....there isnt a 'fork' option because google hosts its own code, it doesnt use github....
have you sync'd the AOSP repo yet?
if you have, then you know you already have the source code ON your computer.
at that point, you can create a project on github and push your repo to it
Click to expand...
Click to collapse
okanb3 said:
My upload speed is 80kb/sn. Pushing all of things takes nearly weeks, i guess.
Any suggestion?
Click to expand...
Click to collapse
I think some repos might be mirrored on Github at https://github.com/android.
bananagranola said:
I think some repos might be mirrored on Github at https://github.com/android.
Click to expand...
Click to collapse
Is that account, official? Or mirrored by someone?
okanb3 said:
Is that account, official? Or mirrored by someone?
Click to expand...
Click to collapse
From the link on that page (http://android.github.io/), it looks like it might be official; however, it is up to an hour late, is read-only, and holds only the most common repos.
Can i make successful build from there? For gnex?
I mean, build without any errors or something? Because i want the stability at the max.
Galaxy Nexus cihazımdan Tapatalk 4 ile gönderildi
I don't understand why you think you need github.
You build from source on your machine.
Sent from my Galaxy Nexus
okanb3 said:
Can i make successful build from there? For gnex?
Click to expand...
Click to collapse
Well, whether you fork or download straight, you need to download whichever one you choose to your computer to build it. I don't know exactly what repos it includes, so I don't know whether all the required repos are there. Also, if you fork, you need to change your manifest to reflect that.
okanb3 said:
I mean, build without any errors or something? Because i want the stability at the max.
Click to expand...
Click to collapse
Er, if you have build errors, you won't have a ROM, stable or otherwise.
Can i do cherry pick without github?
Galaxy Nexus cihazımdan Tapatalk 4 ile gönderildi
okanb3 said:
Can i do cherry pick without github?
Click to expand...
Click to collapse
Yes. Github is just a place to upload your repos. You have your local repos on your computer.
I strongly advise that you research building Android a little more before you begin. Otherwise you'll probably run around in circles for awhile.
bananagranola said:
Yes. Github is just a place to upload your repos. You have your local repos on your computer.
I strongly advise that you research building Android a little more before you begin. Otherwise you'll probably run around in circles for awhile.
Click to expand...
Click to collapse
I'm trying to do that, searching but can't find any good guide. All of them are just old or simple.
For example, i can't find any guide for cherry-picking
okanb3 said:
I'm trying to do that, searching but can't find any good guide. All of them are just old or simple.
For example, i can't find any guide for cherry-picking
Click to expand...
Click to collapse
You should concern yourself with building a successful ROM first. Learn git and repo and then you can learn cherry picking. There are tutorials literally all over this very site that explain how.
Sent from my Galaxy Nexus
Pirateghost said:
You should concern yourself with building a successful ROM first. Learn git and repo and then you can learn cherry picking. There are tutorials literally all over this very site that explain how.
Sent from my Galaxy Nexus
Click to expand...
Click to collapse
I builded my rom once. With Clear All button. But the things too hard when you do it manually. I've make mistakes. Because of that, i've must learn cherry-pick
okanb3 said:
I builded my rom once. With Clear All button. But the things too hard when you do it manually. I've make mistakes. Because of that, i've must learn cherry-pick
Click to expand...
Click to collapse
There are tutorials in this very forum section that explain all of this without using github at all.
Cherry picking does not require github at all
Start here.
http://forum.xda-developers.com/showthread.php?t=1942338
Sent from my Galaxy Nexus
I did that with some searching, but i had errors.
I did these, exactly;
cd android
cd frameworks/base
git checkout
git remote add paranoid https://github.com/ParanoidAndroid/a...rameworks_base
git fetch paranoid
git cherry-pick commit-id(like 7ba230e3513ad0f47bc9b334cbdc3a0d380b8e3c)
But i got these errors (?),
[email protected]:~/android/frameworks/base$ git checkout
packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java: needs merge
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java: needs merge
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java: needs merge
error: you need to resolve your current index first
Click to expand...
Click to collapse
What must i do from now?
You've made changes to the active branch. To cherry-pick now, you need to either commit these changes or revert them.
Never mess with the local master branch, instead create new branches for you to cherry-pick on.
a manta wrote this.