superbAura commented on PR #2410:
URL: https://github.com/apache/james-project/pull/2410#issuecomment-2375488479

   > Please
   > 
   > 
   > 
   > ```
   > 
   > #Fetch apache repository
   > 
   > git fetch apache 
   > 
   > 
   > 
   > git rebase -i apache/master
   > 
   > # squash all the commits into one
   > 
   > 
   > 
   > git push origin -f HEAD
   > 
   > ```
   > 
   > 
   > 
   > The git conflict is still present:
   > 
   > 
   > 
   > 
![image](https://github.com/user-attachments/assets/e77623ff-0cde-41fb-9320-5f1b354b1f58)
   > 
   > 
   
   ok I'll do it soon !!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org

Reply via email to