Conversation

Notices

1. Embed this notice
   waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 05:40:30 JST waifu

   • Arcana

   @arcana@fedi.layer02.net Would appreciate it yes thank you in advance, I'm trying to do a pr for a new feature into dev
   https://git.waifuism.life/waifu/kemoverse/pulls/21
   I think i added a commit from VD in the middle so now git is screaming when i try to merge dev into the new branch to then merge back
   https://git.waifuism.life/waifu/kemoverse/graph

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 05:55:37 JST Phantasm

     in reply to

     • Arcana

     @waifu @arcana I'm honestly kinda confused. It complains about a merge-conflict to master, but it doesn't make sense to me. Looks like some changes from master aren't in the PR branch.

     Try git rebase main on the feature branch for that PR and see what git complains about in the bot/db_utils.py file. That will attempt to take your commits from the point your feature branch and master diverged, update your feature branch to newest master and readd your commits.

     waifu likes this.
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:00:12 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net let me try that, i believe this is the third time i've tried to rebase it lmao

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:01:41 JST Phantasm

     in reply to

     • Arcana
     @waifu @arcana Genuinely no idea what it's on about.
     image.png
     waifu likes this.
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:02:43 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net no i'm trying to merge with dev not master

     Phantasm likes this.
   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:06:06 JST Phantasm

     in reply to

     • Arcana
     @waifu @arcana
     1. git switch stats_system
     2. git rebase dev
     3. v bot/db_utils.py remove markers (<<<<, >>>>, ====) in image below
     4. git add bot/db_utils.py
     5. git rebase --continue
     image.png
     waifu likes this.
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:09:07 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net tfw

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:09:07 JST Phantasm

     in reply to

     • Phantasm
     • Arcana
     @waifu @arcana The issue is btw that the db_utils.py file changed in the same place on both branches and since it's next to eachother, git got confused when trying to merge the changes made to the file.
     waifu likes this.
   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:09:29 JST Phantasm

     in reply to

     • þernia
     • Arcana
     @pernia @arcana @waifu The UI of Gitea completely sucks in these scenarios I spent like 5 minutes trying to decipher the issue from multiple tabs.
   • Embed this notice
     þernia (pernia@cum.salon)'s status on Sunday, 25-May-2025 06:09:30 JST þernia

     in reply to

     • Phantasm
     • Arcana
     @phnt @arcana @waifu gitea is raping waifu for nothing
   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:09:33 JST Phantasm

     in reply to

     • Arcana
     @waifu @arcana Huh??
     waifu likes this.
   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:12:07 JST Phantasm

     in reply to

     • Phantasm
     • Arcana
     @waifu @arcana Dumb question. Are you on the stats_system branch?
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:12:56 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net yes...

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:16:30 JST Phantasm

     in reply to

     • Arcana
     @waifu @arcana Does git switch dev now complain about diverged branches?
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:17:13 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net it doesn't but wait i may have fixed it, i hope

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:18:28 JST Phantasm

     in reply to

     • Phantasm
     • Arcana
     @waifu @arcana Like this.
     
     I think you overwrote your dev branch with the contains of the stats_system branch with the reset --hard command.
     image.png
     waifu likes this.
   • Embed this notice
     munir (munir@fedi.munir.tokyo)'s status on Sunday, 25-May-2025 06:19:15 JST munir

     in reply to

     • Phantasm
     • Arcana
     @waifu @phnt @arcana wow cool project, can i help by cleaning up issues? im decent with python i think
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:21:24 JST waifu

     in reply to

     • Phantasm
     • munir
     • Arcana

     @munir@fedi.munir.tokyo @phnt@fluffytail.org @arcana@fedi.layer02.net of course, we have a telegram group if you want to join too, i'll dm you an account for the gitea

   • Embed this notice
     munir (munir@fedi.munir.tokyo)'s status on Sunday, 25-May-2025 06:22:01 JST munir

     in reply to

     • Phantasm
     • Arcana
     @waifu @phnt @arcana invite for the tg :>
     
     jsyk: i cant spanish
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:23:04 JST waifu

     in reply to

     • Phantasm
     • Arcana

     @phnt@fluffytail.org @arcana@fedi.layer02.net my config was like pull.rebase=true and it kept trying to rebase i think, it never wanted to merge, idk why that happened but now it looks fine thanks for the help friends

     Phantasm likes this.
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Sunday, 25-May-2025 06:23:31 JST waifu

     in reply to

     • Phantasm
     • munir
     • Arcana

     @munir@fedi.munir.tokyo @phnt@fluffytail.org @arcana@fedi.layer02.net all english so no worries

   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 06:28:30 JST Phantasm

     in reply to

     • Arcana
     @waifu @arcana It doesn't complain so it's probably alright.
     
     >thanks for the help friends
     No worries.
     waifu likes this.
   • Embed this notice
     waifu (waifu@mai.waifuism.life)'s status on Wednesday, 28-May-2025 09:12:04 JST waifu

     in reply to

     • vertka
     • Arcana

     @vertka@suya.place @phnt@fluffytail.org @arcana@fedi.layer02.net gitea ui

   • Embed this notice
     vertka (vertka@suya.place)'s status on Wednesday, 28-May-2025 09:12:05 JST vertka

     in reply to

     • Phantasm
     • Arcana
     @waifu @phnt @arcana is this git UI?
     Phantasm likes this.
   • Embed this notice
     Phantasm (phnt@fluffytail.org)'s status on Wednesday, 28-May-2025 17:03:03 JST Phantasm

     in reply to

     • vertka
     • Arcana
     @vertka @arcana @waifu This is gitea, but you can also get similar graphs from git with git log --graph
     image.png