[
https://issues.apache.org/jira/browse/AMQ-9218?focusedWorklogId=850619&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-850619
]
ASF GitHub Bot logged work on AMQ-9218:
---------------------------------------
Author: ASF GitHub Bot
Created on: 13/Mar/23 10:23
Start Date: 13/Mar/23 10:23
Worklog Time Spent: 10m
Work Description: cshannon commented on PR #968:
URL: https://github.com/apache/activemq/pull/968#issuecomment-1465875597
@mattrpav - going forward instead of always force pushing it's probably
better to just push new commits. The issue is any comments/history get blown
away every time you force push so I can't see what you changed from the last
time. This is ok for small stuff but is annoying for larger commits.
The best workflow I have found is what is used on Apache Accumulo:
1. Push new commits as you make changes, **don't force push**
2. If you want to get the latest changes from the original branch (ie main)
don't rebase off main as then you'd have to force push. Instead just merge main
into this branch periodically and push up the commit. ie "**git merge main**"
3. When it comes time to do the final merge, pick the "**Squash and merge**"
option. This will squash everything into 1 commit and add it to the end so we
essentially get the same effect as if you had force pushed and re-based but the
history doesn't always get blown away. When you pick this option it allows you
to modify the commit message so you can change it before the final merge.
Issue Time Tracking
-------------------
Worklog Id: (was: 850619)
Time Spent: 40m (was: 0.5h)
> Add activemq-client-jakarta transitional module for 5.18.0
> ----------------------------------------------------------
>
> Key: AMQ-9218
> URL: https://issues.apache.org/jira/browse/AMQ-9218
> Project: ActiveMQ
> Issue Type: Task
> Reporter: Matt Pavlovich
> Assignee: Jean-Baptiste Onofré
> Priority: Major
> Fix For: 5.18.0
>
> Time Spent: 40m
> Remaining Estimate: 0h
>
> This module provides a activemq-client repackaged for the jakarta.jms.*
> namespace
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
