Conversation

Notices

1. Embed this notice
   heluecht (heluecht@pirati.ca)'s status on Sunday, 11-Dec-2022 04:33:23 JST heluecht

   • hypolite
   • Philipp Holzer
   • Friendica Developers
   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?
   • Embed this notice
     hypolite (hypolite@friendica.mrpetovan.com)'s status on Sunday, 11-Dec-2022 04:33:20 JST hypolite

     in reply to

     • Philipp Holzer
     @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.
   • Embed this notice
     hypolite (hypolite@friendica.mrpetovan.com)'s status on Sunday, 11-Dec-2022 04:36:19 JST hypolite

     in reply to

     • Philipp Holzer
     @heluecht @tobias @nupplaphil It looks fine to me, don’t bother trying to take this merge back.