Resolving conflicts

.arcconfig

@@ -1,4 +1,4 @@
 {
-  "repository.callsign" : "C",
+  "repository.callsign" : "G",
   "conduit_uri" : "https://reviews.llvm.org/"
 }

.clang-tidy

@@ -1,4 +1,4 @@
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,readability-identifier-naming'
+Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,readability-identifier-naming'
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
     value:           CamelCase

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.gitignore

@@ -18,30 +18,41 @@
 # vim swap files
 .*.sw?
 .sw?
+#OS X specific files.
+.DS_store
+
+# Nested build directory
+/build
+# Visual Studio nested build directory
+/llvm/out
 
 #==============================================================================#
 # Explicit files to ignore (only matches one).
 #==============================================================================#
+# Various tag programs
+/tags
+/TAGS
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+.gitusers
+autom4te.cache
 cscope.files
 cscope.out
-/tags
+autoconf/aclocal.m4
+autoconf/autom4te.cache
+/compile_commands.json
+# Visual Studio built-in CMake configuration
+/CMakeSettings.json
+# CLion project configuration
+/.idea
 
 #==============================================================================#
 # Directories to ignore (do not add trailing '/'s, they skip symlinks).
 #==============================================================================#
-# Clang extra user tools, which is tracked independently (clang-tools-extra).
-tools/extra
-# Sphinx build products
-docs/_build
-docs/analyzer/_build
-# debug info testsuite
-test/debuginfo-tests
-
 # VS2017 and VSCode config files.
 .vscode
 .vs
-
-# Pycharm IDE files.
-.idea/
-.cmake-build-debug/
-
+# clangd index
+.clangd