acassis commented on pull request #4289: URL: https://github.com/apache/incubator-nuttx/pull/4289#issuecomment-893755218
@phfbertoleti in the tab Commits here should appear only 1 commit, now it is showing 2 commits and 3 merges. Did you create an "upstream" branch pointing to github.com/apache/incubator-nuttx master? If so you can do this way: $ git checkout upstream $ git pull $ git checkout master $ git rebase upstream $ git rebase -i HEAD~2 In the editor message you keep the first commit and squash the second: just put "s" at beginning of the second line. Use "git log" to confirm there is only 1 commit from you now and force a push: $ git push -f -- 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]
