Zainab-Saad commented on PR #860: URL: https://github.com/apache/age/pull/860#issuecomment-1538692175
@jrgemignani Apologies if I was not clear before, the issue is that I used some cherry-pick command to resolve merge conflict and ended up with these so many cluttered commits that do nothing (don't resolve conflict :) ). I ended up resolving the conflict on github web rather than from my local system. So squashing or deleting will definitely cause merge conflicts to arise again. And I can not rebase properly because it results in empty commits, (--alow-empty) is not helping right now. Yes, you are definitely right about force pushing but I would go on force pushing once rebase is done properly. In short, I am facing issues while rebasing -- 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: commits-unsubscr...@age.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
