Hey everyone,
I spoke with dzickus about this and he suggested I reach out to the list to get
an idea of how to fix this.
I originally pushed a branch "osnamechange" to gitlab and created merge request
354. That patch, as discussed in the other thread, caused CKI to fail.
jcline commented in 354 that I had to rebase and make changes to his new Sphinx
documentation. So I did
git fetch --all
git pull
git checkout osnamechange
git reset --hard upstream/os-build
<made my changes here and created _1_ patch>
git push -f git@gitlab.com:prarit/kernel-ark.git osnamechange
which logically made sense to me.
The result of this is that I now have 193 identified patches in the merge
request. It appears what has happened is that the reset pulled in all of the
changes from upstream.
So I have some questions ;)
1. What did I do wrong wrt to the kernel-ark workflow?
2. How do undo what I did ;)?
Since no one has reviewed the patch, I could just delete the branch and start
over. I'd rather know what I did wrong so I can avoid doing it in the future.
P.