Important changes to forums and questions
All forums and questions are now archived. To start a new conversation or read the latest updates go to forums.mbed.com.
.orig file after merge conflict
Topic last updated 16 May 2016, by 
wayne roberts.
0
replies
wayne roberts.
0
replies
After resolving merge conflict as shown in section 3 of https://developer.mbed.org/handbook/Collaboration/Multiple-authors A myfile.cpp.orig file was created. After resolving the conflict and comitting the merge, this .orig file still remains. How can I remove this .orig file?