Github help - Android Q&A, Help & Troubleshooting

I have a kernel that I need to merge MM-mr2 in. So I have my kernel and MM-mr2 in my github. I just need to merge mr2 into my base. I have googled my a** of and havent had any luck. Someone who could help with the commands it would be greatly appreciated

---

Not sure I am tracking completely. I'll do what I can to answer your query.
From what you are describing, you have 2 branches, Master and MM-mr2 for your kernel. Refer to Basic Branching and Merging and more Visual explanation here.
The critical thing to know is that, both should be your branches. If one of them is owned by someone else, then you will be required to create a Pull Request.
Basically here are the steps you'd follow.
Checkout your master Branch where your other branch is going to be merged.
I assume MM-MR2 is another branch in the same repository Tree. If so, just issue ,
Code:
git merge MM-mr2
Now issue git status command to see the merge resulted in conflicts. It most likely will depending on what MR2 had that master did not.
Resolve the conflicts, then issue,
git add -A
this will add all the modified files to your commit. At which time you can do
git commit --amend
which will create a new commit on the master branch. This you can push to your git.
Oh and FYI, this thread is a good resource to me. [Guide] How to use Github

---

Perseus said:
Not sure I am tracking completely. I'll do what I can to answer your query.
From what you are describing, you have 2 branches, Master and MM-mr2 for your kernel. Refer to Basic Branching and Merging and more Visual explanation here.
The critical thing to know is that, both should be your branches. If one of them is owned by someone else, then you will be required to create a Pull Request.
Basically here are the steps you'd follow.
Checkout your master Branch where your other branch is going to be merged.
I assume MM-MR2 is another branch in the same repository Tree. If so, just issue ,
Code:
git merge MM-mr2
Now issue git status command to see the merge resulted in conflicts. It most likely will depending on what MR2 had that master did not.
Resolve the conflicts, then issue,
git add -A
this will add all the modified files to your commit. At which time you can do
git commit --amend
which will create a new commit on the master branch. This you can push to your git.
Oh and FYI, this thread is a good resource to me. [Guide] How to use Github
Click to expand...
Click to collapse
Heres my github https://github.com/APOPHIS9283
I need to merge shamu-mr2, into Project-Rachel

---

apophis9283 said:
Heres my github https://github.com/APOPHIS9283
I need to merge shamu-mr2, into Project-Rachel
Click to expand...
Click to collapse
Merging two repos is a immense undertaking. Not that it can not be done. But it means enormous amount of work. It is not the same as merging two branches, as I assumed earlier.
Would you care to explain why those two repos need to be merged? Is there a set of commits from one that you'd like in the other ?

---

Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google

---

*BUMP*

---

Anyone?

---

apophis9283 said:
Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google
Click to expand...
Click to collapse
In that case, do a Diff on github.com and choose those two to compare. That will create a Pull Request that you can merge. Please see this Tut.

---

Perseus said:
In that case, do a Diff on github.com and choose those two to compare. That will create a Pull Request that you can merge. Please see this Tut.
Click to expand...
Click to collapse
One last question. Sorry Github and such has always beena weak point.
https://android.googlesource.com/kernel/msm/+/android-msm-shamu-3.10-marshmallow-mr2/
I try to fork that but there doesnt seem to be a way

---

apophis9283 said:
Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google
Click to expand...
Click to collapse
apophis9283 said:
One last question. Sorry Github and such has always beena weak point.
https://android.googlesource.com/kernel/msm/+/android-msm-shamu-3.10-marshmallow-mr2/
I try to fork that but there doesnt seem to be a way
Click to expand...
Click to collapse
Trust me when I say, I HATE Git for the obnoxious, inane and downright silly errors it throws at me. You're not the first and most definitely not the last.
As to that link, unfortunately you will need to download a archive (See that .tgz link up top ? ). Expand the contents locally, then create a dummy repo in your own Git via web. Then Push the local unzipped folder to that Repo. The end result on Github should look exactly like what is at that link. Here's a Link that might help.

---

Perseus said:
Trust me when I say, I HATE Git for the obnoxious, inane and downright silly errors it throws at me. You're not the first and most definitely not the last.
As to that link, unfortunately you will need to download a archive (See that .tgz link up top ? ). Expand the contents locally, then create a dummy repo in your own Git via web. Then Push the local unzipped folder to that Repo. The end result on Github should look exactly like what is at that link.
Click to expand...
Click to collapse
I created a dummy github account and forked mr2. No matter what I do I cant even see mr2 as an option. This has been so frustrating I just dont have the patience to deal with it anymore. I truly appreciate your time

---

Thanks to xanax droid. I literally had to type in 4 commands and bam. I was fone that quick