Conversation

Notices

1. Michael Vogel (heluecht@pirati.ca)'s status on Saturday, 10-Dec-2022 20:41:35 CET Michael Vogel

   • hypolite
   • Friendica Developers
   • nupplaphil
   Args ...
   I slightly pressed the wrong buttons on my machine ... Means that I directly merged my last coding into the addon-branch.
   
   @hypolite @nupplaphil @tobias possibly you know a way to clean this up - or you are okay with my small change anyway?
   • hypolite (hypolite@friendica.mrpetovan.com)'s status on Saturday, 10-Dec-2022 20:41:35 CET hypolite

     in reply to

     • nupplaphil
     @heluecht @tobias @nupplaphil You can reset to the previous commit before the merge and force-push but it will break installs who do automatic develop pulls, or revert the merge commit and push it. You’ll have to create a new branch where you’ll have to revert the revert to be able to submit the same changes again.
     
     Before you do any of these, let me review the change.
   • hypolite (hypolite@friendica.mrpetovan.com)'s status on Saturday, 10-Dec-2022 20:41:35 CET hypolite

     in reply to

     • nupplaphil
     @heluecht @tobias @nupplaphil It looks fine to me, don’t bother trying to take this merge back.
   • Michael Vogel (heluecht@pirati.ca)'s status on Saturday, 10-Dec-2022 20:41:35 CET Michael Vogel

     in reply to

     • hypolite
     • nupplaphil
     @tobias @hypolite @nupplaphil Okay.