peterremote1980 commented on issue #1065: add a search in the "customize toolbar" dialog URL: https://github.com/apache/incubator-netbeans/pull/1065#issuecomment-450918425 > > PS: I see GitHub complaining that there are some 'Conflicting files'. So, make sure you also rebase your code perhaps? Usually conflicts mean the code changed in the meantime. > > the code changes is based on the master branch of the github source, did i do it wrongly? i don't understand why, i just forked it 3 days ago.
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
