19priyadhingra commented on PR #141: URL: https://github.com/apache/flink-connector-aws/pull/141#issuecomment-2278630542
> @19priyadhingra It looks like you've merged the remote branch into your fork. Instead of doing that you need to rebase your commit on it. > > Recreating fork and PR is a bit extreme, here's are steps that can help recover branch (tested on my side, but have not verified content): > > ``` > # get copy of your fork repo, useful to have it separately to verify that no changes were lost > git clone [email protected]:19priyadhingra/flink-connector-aws.git > cd flink-connector-aws/ > > # add main repo as a remote and get metadata > git remote add upstream [email protected]:apache/flink-connector-aws.git > git fetch --all > > # roll back merge commit > git reset HEAD~1 > > # rebase onto upstream branch > git pull -r upstream main > ``` > > Please let me know if this helped THANKS A LOT, @z3d1k . This worked :-) Much appreciated for this quick help!! -- 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]
