teemperor added a comment. In D81001#2189008 <https://reviews.llvm.org/D81001#2189008>, @gedatsu217 wrote:
>> Also could you rebase the diff here when you have time (e.g., regenerate the >> diff from you changes on top of the latest master commit)? It no longer >> applies at the moment without having to manually resolve a conflict. > > Does this mean that I should generate diff from the current latest master > commit of [https://github.com/llvm/llvm-project]? or from my latest commit > (local)? Sorry, I am not used to using git:( No worries! From the latest master commit from GitHub.com is what I mean. Someone changed one of the lines your patch changes between your checkout and master and now there is a conflict when applying thes patch. If you `git pull` on your master branch and then make a new diff, then everyone can apply this patch again without having to manually resolve this conflict over and over again. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81001/new/ https://reviews.llvm.org/D81001 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
