patacongo 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-571865228
 
 
   It is not really "corrupted".  I overstated that.  Two things to note:  All 
of the "extra commits" but one are not commits are all, they are just merge 
points.  I synchronize with upstream like:
   
   git fetch upstream
   git pull upstream master
   git push origin master
   
   The second step creates the merge point because a change was merged into the 
fork from upstream.  The merge point does not correspond to any changes to 
files.  It is just noting where I merged from upstream.
   
   There one other no file commit which I don't understand.  I made some error 
several days ago
   
   The the change, in this case, was juse remove one character and adding two 
fails -> failed.  Add if you look at what changed in all of the combine 
commits.  Is is only those two characters.  No nothing is wrong, nothing is 
"corrupted", everything is great!  But the comments generated by git stink.
   
   I don't know if a rebase vs the pull from upstream will eliminate the merge 
point, but I don't think so.  I will experiment.  A better approach my be to 
not try to keep the fork up-to-date until I need to use.
   
   I synchronize the bitbuck repositories the same way.  Each new commit brings 
in a new merge point too.  I really don't like that but, as far as I know, it 
is unavoidable.
   

----------------------------------------------------------------
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

Reply via email to