See Jason’s email from two weeks ago: > I didn't intend for it, but when you add a file to the xcode project file, > Xcode will reorder all the currently-sorted files and we'll get all the same > merge conflicts we've had for the past couple years again. > We could either back out my sorting of the project files (and continue to > have constant merge conflicts like always) or we can sort the xcode project > file every time we have to add something to it. That's what we're doing. > scripts/sort-pbxproj.rb is the script I threw together to do this. Run it in > the lldb.xcodeproj directory and it will output a new project file on stdout. > Not the most friendly UI, I can go back and revisit that later. > J
> On Jul 23, 2018, at 3:04 PM, Greg Clayton via lldb-dev > <lldb-dev@lists.llvm.org> wrote: > > Anyone know if something has happened to the Xcode project file? Did someone > sort or try to manually do something to the Xcode project? If I add or remove > a file, then I end up with 1000s of diffs... > > Greg > > _______________________________________________ > lldb-dev mailing list > lldb-dev@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-dev _______________________________________________ lldb-dev mailing list lldb-dev@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-dev
