Conversation

Notices

1. Embed this notice
   Mergan (mergan@pleroma.viridianpatriots.com)'s status on Tuesday, 12-Sep-2023 20:50:53 JST Mergan
   @chjara I think I know why-- let me see what I can do :acat_loading:
   • Embed this notice
     narcolepsy and alcoholism :flag: (hj@shigusegubu.club)'s status on Tuesday, 12-Sep-2023 20:50:51 JST narcolepsy and alcoholism :flag:

     in reply to
     @mergan @chjara can you upstream it?
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Tuesday, 12-Sep-2023 20:50:52 JST Mergan

     in reply to

     @chjara It is done :cat_mic2:

   • Embed this notice
     narcolepsy and alcoholism :flag: (hj@shigusegubu.club)'s status on Wednesday, 13-Sep-2023 07:43:17 JST narcolepsy and alcoholism :flag:

     in reply to
     @mergan @chjara pleroma
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Wednesday, 13-Sep-2023 07:43:18 JST Mergan

     in reply to

     • narcolepsy and alcoholism :flag:
     @hj @chjara "upstream"? :heheperhaps:
   • Embed this notice
     narcolepsy and alcoholism :flag: (hj@shigusegubu.club)'s status on Wednesday, 13-Sep-2023 07:46:20 JST narcolepsy and alcoholism :flag:

     in reply to
     @mergan @chjara means bringing the changes from the fork to the upstream.
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Wednesday, 13-Sep-2023 07:46:21 JST Mergan

     in reply to

     • narcolepsy and alcoholism :flag:
     @hj @chjara what does "upstream" mean though :acat_confused:
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Wednesday, 13-Sep-2023 07:54:20 JST Mergan

     in reply to

     • narcolepsy and alcoholism :flag:
     @hj @chjara Sorry comrade, I'm not well versed in git lingo yet. Most I can do are push/pulls, I just recently learned that pull and pull request are different things-- I wouldn't know how to do that :acat_incredulous:
   • Embed this notice
     narcolepsy and alcoholism :flag: (hj@shigusegubu.club)'s status on Wednesday, 13-Sep-2023 07:54:20 JST narcolepsy and alcoholism :flag:

     in reply to
     @mergan @chjara basically, take same(ish) pull/merge request but submit to a different repo, adjusting changes so they work there without extraneous changes and.
     
     Pull Request really is a GitHub terminology and is kinda stupid, i.e. "pull (and have a look at my changes please)" request vs. "(please) merge (my changes into main working branch)" request.
   • Embed this notice
     narcolepsy and alcoholism :flag: (hj@shigusegubu.club)'s status on Wednesday, 13-Sep-2023 08:08:44 JST narcolepsy and alcoholism :flag:

     in reply to
     @mergan "pulling" really means "fetching" (i.e. having your local git ask the server what stuff it has and download that stuff) and also setting local branch to whatever you told it to. So when I do "git pull origin master" it essentially does equivalent of "git fetch origin" (downlad stuff) and then something like "git checkout -b master origin/master" (switch to "master" branch and update it to point to "origin/master" (local copy of remote branch)) (it doesn't actually do that but that's details).
     
     cherry-picking is when you essentially take a commit, extract whatever changes were happening to it and apply those changes on a new context, essentially creating a clone of that commit, as far as changes, messages, authorship etc concerned. A rebase is essentially a series of cherry-picks (plus updating the branch pointer)
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Wednesday, 13-Sep-2023 08:08:45 JST Mergan

     in reply to

     • narcolepsy and alcoholism :flag:
     @hj That makes sense hmm
     
     What would be the difference between me pulling and ye cherry picking? :heheperhaps:
   • Embed this notice
     Mergan (mergan@pleroma.viridianpatriots.com)'s status on Wednesday, 13-Sep-2023 18:02:56 JST Mergan

     in reply to

     • narcolepsy and alcoholism :flag:
     @hj Thank ye for the explanation-- I'll see if I can do the thingy later :cat_mic2:
     narcolepsy and alcoholism :flag: likes this.