leomar95 edited a comment on pull request #1617: URL: https://github.com/apache/incubator-nuttx/pull/1617#issuecomment-677906930
> > I tried these steps, but it didn't work for #1618 > > It looks like your also did some 'git merge' . Merging and rebasing are incompatible because merging screws up the history. You should rebase only so that you changes are always applied on top of master. Once you merge, you can never recover the clean branch. You would have to start over like: > > * git -m > * git checkout master > * git pull upstream master > * git checkout -b > * git cherry-pick > * git push -f origin > > That will re-create a clean branch with only your last changes on top of master. > > So, th Thanks for your support. I tried your tutorial, but wasn't clear to me. So, i decided to do this: * reset mybranch - git reset origin/master * git checkout master * git pull upstream master * git rebase -i master --> drop the merge commits * git checkout mybranch * git rebase master * git push -f It's worked in #1618 ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
