Ouss4 commented on issue #52: boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c: Fix typo noted by João Matos. URL: https://github.com/apache/incubator-nuttx/pull/52#issuecomment-571977218 Why wouldn't rebasing eliminate the merge point? It should effectively apply any commit you had on top of master and thus eliminate any merge commit. But if one had a clean history "just" merge would suffice (provided that fast-forward isn't disabled) However none of that is a real issue, what I was trying to point out (or understand) is that these "old" commits could apply their changes if they got reverted or the change they had got updated. Since we are squashing them, they slide unnoticed with the rest of the PR. I was also trying to suggest cherry picking only the relevant commits. For instance in this PR only the last commit had a relevant change, the others have been merged before. As a side note: > git fetch upstream > git pull upstream master > git push origin master Isn't the fetch redundant?
---------------------------------------------------------------- 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] With regards, Apache Git Services
