malhar1995 added a comment. In https://reviews.llvm.org/D32449#761303, @NoQ wrote:
> Thanks, this is great! Two more things: > > - You have touched other code, unrelated to your patch, with clang-format; > we're usually trying to avoid that, because it creates merge conflicts out of > nowhere, and because some of that code actually seems formatted by hand > intentionally. It's better to revert these changes; you can use the `git > clang-format` thing to format only actual changes. I did not apply clang-format to any file except for PthreadLockChecker.cpp. Do you think the merge conflict is due to me not applying clang-format to test/Analysis/pthreadlock.c? The only files I changed were .gitignore, PthreadLockChecker.cpp and test/Analysis/pthreadlock.c. Also, when you asked me to revert the changes, did you mean revert the changes made by clang-format? If yes, how do I do that? I apologize for asking such silly questions. The thing is I'm new to all this and I don't really know how to proceed further. > > > - Updating .gitignore sounds like the right thing to do (llvm's .gitignore > already has this), but i guess we'd better make a separate commit for that. Repository: rL LLVM https://reviews.llvm.org/D32449 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
