Generated tracked files

[ochagnon]

I just tried to upgrade Qaterial and I got the following error:

[0/7] Performing update step for 'qolm-populate'
CMake Error at /Users/xxx/sandbox/yyy/build-Test-Desktop_Qt_5_15_1_clang_64bit-Debug/_deps/qolm-subbuild/qolm-populate-prefix/tmp/qolm-populate-gitupdate.cmake:121 (message):

  Failed to rebase in:
  '/Users/xxx/sandbox/yyy/build-Test-Desktop_Qt_5_15_1_clang_64bit-Debug/_deps/qolm-src'.

  Output from the attempted rebase follows:

  First, rewinding head to replay your work on top of it...

  Applying: ✨ Make indexOf & remove working with const QObject*

  Using index info to reconstruct a base tree...

  M include/QOlm/QOlm.hpp

  Falling back to patching base and 3-way merge...

  Auto-merging include/QOlm/QOlm.hpp

  CONFLICT (content): Merge conflict in include/QOlm/QOlm.hpp

  error: Failed to merge in the changes.

  hint: Use 'git am --show-current-patch' to see the failed patch

  Patch failed at 0001 ✨ Make indexOf & remove working with const QObject*

  Resolve all conflicts manually, mark them as resolved with

  "git add/rm <conflicted_files>", then run "git rebase --continue".

  You can instead skip this commit: run "git rebase --skip".

  To abort and get back to the state before "git rebase", run "git rebase
  --abort".

  You will have to resolve the conflicts manually

[OlivierLDff]

That is entirely my fault, i've been playing with the master to fix a bug on it. Multiple choice :

• Remove all file and do cmake .. again
• Fix by hand the git conflict
• Add -DFETCHCONTENT_UPDATES_DISCONNECTED=ON to your cmake command to avoid update at each configure time. I recommend this solution, as it will greatly improve the time of configure after the first run (that download dependencies)

More info here : https://cmake.org/cmake/help/latest/module/FetchContent.html