e2corporation commented on PR #3107: URL: https://github.com/apache/incubator-devlake/pull/3107#issuecomment-1259953885
> > @henit-chobisa Another issue that may affect this PR from a clean merge is that you have issued `merge` commits when updating changes from `main` branch, when we prefer a `rebase` policy instead (ie `git pull --rebase`) that way feature commits are replayed on top of main cleanly. > > So should I undo the merge commits and do rebase with that ? It still looks like it would be a manual cherry-pick process to be able to resolve the issue. I would create a local clone/backup of this branch. Create a new branch from `main` as the starting point, cherry-pick all relevant changes to working copy and then force-push the branch to `henit-chobisa:Responsive-Sidebar`. This PR can also be closed and we can re-issue a new PR from another branch as well. -- 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]
