Remove *.orig files from version control #768
Conversation
By git mergetool docs: > git mergetool creates *.orig backup files while resolving merges. These > are safe to remove once a file has been merged and its git mergetool > session has completed. As there were no references found to these *.orig files in the codebase, the assumption is that these files have been included accidentally by executing some variation of `git add secp256k1-sys/depend/secp256k1/*`, and they seem to not serve any use case, therefore they will be removed from version control by this commit.
By git mergetool docs: > git mergetool creates *.orig backup files while resolving merges. These > are safe to remove once a file has been merged and its git mergetool > session has completed. These files don't serve any use case in the source version control, so are going to be ignored from version control from this commit on.
|
Thanks for checking so carefully! These are part of the output of The set of files changes over time because different version of The CI failure is unrelated to your PR. I'll run my tests on this and ACK/merge it. |
|
Thanks for the thorough response. I found this by accident while rebasing a local branch, I executed |
Looking at the changes of last update to version
6.0oflibsecp256k1I noticed the file extension of two new added files were.orig.Considering the context, I assumed these files are the result of the execution of
git mergetool, and were not intended to be included in the commit initially.Trying to understand if they served another purpose I realized a third orig file was committed with the update of
libsecp256k1to version4.0,I checked for any references for these files in the codebase but didn't find any.
I also checked the libsecp256k1 to know if this was something committed in that repository but I confirm is not.
To keep the source code tree clean I removed these files, and also added a new
.gitignorerule to avoid the inclusion of these files in the future.