Originally Posted by atharwaqas
So i am working on CM 13 and trying to add Halo to the build. Following your guide i used gerrit to download both framework and settings package and proceed as you have said but when i do a git status i get this
both modified: core/java/com/android/internal/logging/MetricsLogger.java
both modified: packages/SystemUI/proguard.flags
both modified: packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
both modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
both modified: services/core/java/com/android/server/notification/NotificationManagerService.java
both modified: services/core/java/com/android/server/notification/RankingConfig.java
both modified: services/core/java/com/android/server/notification/RankingHelper.java
You need to resolve each files errors and add them each with git add file name.
Then you can do git cherry-pick continue.
Halo is probably not the easiest thing to start with... Try a smaller feature maybe?
---------- Post added at 11:37 AM ---------- Previous post was at 11:36 AM ----------
Hey so I have a problem / question.
I forked a repo and made a new branch...
I cloned said branch on my computer and added some cherry picks.. How do I make these changes reflect online?