clebertsuconic commented on PR #3999: URL: https://github.com/apache/activemq-artemis/pull/3999#issuecomment-1090680515
@waldi5001 look what I did at https://github.com/clebertsuconic/activemq-artemis/tree/ARTEMIS-3707 I basically got your branch.. rebased against main... squashed all the commits and pushed -f on my origin... you could do the same... git is different from SVN on this sense..when you merge your work upstream, you can only merge commits as they make sense upstream.. we don't need every interaction you ever had with your code... it makes more confusing to follow on the history. if you agree with the squash I made, you could type these commits: ``` git remote add clebert https://github.com/clebertsuconic/activemq-artemis.git git fetch clebert git checkout clebert/ARTEMIS-3707 -B ARTEMIS-3707 git push origin ARTEMIS-3707 -f ``` this should replace all your commits by my squashed. if you want to squash them yourself.. first rebase your repo, fix a conflict you have on a commit and push -f as I showed you. if you still having issues find me somewhere online and I can give you some help on this. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
