james94 commented on PR #1793: URL: https://github.com/apache/nifi-minifi-cpp/pull/1793#issuecomment-2173825059
@lordgamez @szaszm I merged latest upstream main branch into my forked main branch and then merged my forked main branch into my MINIFICPP-2346-P1 branch. Initially, I had probably close to **200** changes and after merging in upstream's main branch to my MINIFICPP-2346-P1 branch, the changes went up to **1,846** changes. Is this okay? - Also I chose not to rebase and instead went for the merge approach since rebasing in the passed caused me to lose my updates on previous branches. -- 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]
