search

ohmybash / oh-my-bash

A delightful community-driven framework for managing your bash configuration, and an auto-update tool so that makes it easy to keep up with the latest updates from the community.
https://ohmybash.github.io
MIT License
5.8k stars 647 forks source link

maintaining a fork #194

Open cauerego opened 3 years ago

cauerego commented 3 years ago

so, i just made myself a theme, because i liked OMB but not any of the themes.

https://github.com/cauerego/oh-my-bash/

i read you don't want new themes. and adding plugins is complicated. plus, i probably added way more than necessary, anyway. but it works for me.

since you probably wouldn't want my PR i won't even bother making one... (but let me know if you do)

the question is:

could you please recommend me a way so i could just keep my fork updated as automatically as possible? should i look for github actions or is there some better way?

thanks for this amazing little piece of software! 😘

nntoan commented 3 years ago

Hi @cauerego ,

The words there is a lie, I do recommend new theme pushed to the repository, please feel free to do that!

cauerego commented 3 years ago

@nntoan lol, awesome! much easier for me, thanks. 😁

195

i'll leave this open, though... because the actual question isn't yet answered. for future reference.

cauerego commented 3 years ago

i spent at least 2 hours today trying to close this, by answering my own question, but i couldn't finish it.

basically i got to many issues on the way, as it happens so often with everything linux, and had to keep digging.

it should be simple enough, right? pull the origin, fetch the headless commit from the PR, merge. but the problem is maintaining it after updates in each side! plus i can't seen to find people who are sure to have stumbled on such issue.

anyway, i'll just leave here a small part of my unfinished research to continue at a later time... or even drop it, in case #195 ever gets merged for instance.

these might help:

https://devconnected.com/how-to-set-upstream-branch-on-git/

https://jigarius.com/blog/multiple-git-remote-repositories

these can use better answers:

https://stackoverflow.com/questions/56409392/how-to-keep-a-github-fork-up-to-date-without-a-merge-commit-or-using-cli#

https://stackoverflow.com/questions/6743514/how-can-i-fetch-an-unmerged-pull-request-for-a-branch-i-dont-own

https://stackoverflow.com/questions/39761024/refusing-to-merge-unrelated-histories-failure-while-pulling-to-recovered-repos/39783462#39783462

https://stackoverflow.com/questions/3623755/why-does-my-git-branch-have-no-master

https://www.reddit.com/r/git/comments/jy8aoz/merging_unrelated_histories/

cauerego commented 3 years ago

@nntoan yo dude! could you please help me to make my simple pull request something easy for you to just accept?

https://github.com/ohmybash/oh-my-bash/pull/195#issuecomment-901634626

too often when i update oh-my-bash, things break (on my end) because of this issue! 😔

although today i quickly "solved" it by using

git checkout absimple 🥴