Hi all,
thanks to all who helped me. Hopefully I've now created a reasonable
PR#7517. Of course if some fine tuning is necessary let me know to
change/fix.
kind regards,
Frtiz
Am 03.01.2022 um 16:01 schrieb Nona Hansel:
I know how I would proceed if I were to get rid of some commits: I
would create a brand new branch and cherry-pick relevant commits to
this branch. After that, I would create a new PR submitting the new
branch. I would do this to avoid any commit removal because these
procedures makes me nervous. So I would do this:
1. on the branch where I have all the commits, I would |git log| to
see the commits with their hash which is the long sequence of
number and letters (or maybe it is hexadecimal number? sorry for
my ignorance) after the word commit, for example
ff5a5696227e0794bddfc6dd89b401f13b9a78ea
2. I would create a brand new branch from oi/hipster which should be
up to date (this can be done by |git fetch upstream| and after
that |git rebase upstream/oi/hipster|)
creating new branch: |git checkout -b new_branch|
3. on this new_branch, I would |git cherry-pick
hash_of_relevant_commit| which makes a copy of that commit and
apply it in new_branch. You can cherry-pick as many commits as you
need.
The advantage of this procedure is that it leaves this branch (meaning
the old one) intact, just in case.
If the PR is about adding a component, it should contain one commit.
In case that the change is currently part of several commits, these
commits should be squashed after they're cherry-picked to new_branch.
If you need help with that, I can provide some guidance so feel free
to write me.
—
Reply to this email directly, view it on GitHub
<https://github.com/OpenIndiana/oi-userland/pull/7496#issuecomment-1004150263>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AW7A7VRCEJZYCLGEL7JKZYLUUG24FANCNFSM5LAFQ4FA>.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
You are receiving this because you authored the thread.Message ID:
<OpenIndiana/oi-userland/pull/7496/[email protected]>
_______________________________________________
oi-dev mailing list
[email protected]
https://openindiana.org/mailman/listinfo/oi-dev
