yjdwbj commented on pull request #2422: URL: https://github.com/apache/incubator-nuttx/pull/2422#issuecomment-735050616
> @yjdwbj please remove: > > ``` > Merge remote-tracking branch 'upstream/master' into dev/stm32l152re-ili93418b-driver > ``` > > from the pathset. @Xiaoxiang781216 , Hi, I think I did something wrong git's manipulate, the resulting of `This branch cannot be rebased due to conflicts`, So, I am so sorry about that this is my first pull request. ---------------------------------------------------------------- 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: us...@infra.apache.org
