Sounds like someone might have checked in some files they shouldn't have or neglected to check them in previously.
In any event, if you haven't modified any files in your source tree, you can run: $ git reset --hard release-3.4.1 That will make your tree look like release-3.4.1, regardless of what you may have done. So do NOT do this if you've modified any of the files. Use "git status" and look for "modified" files. There is a "git checkout -f" flag, but I haven't used that. By the way, whenever I'm learning a new Git command (like git checkout -f), I'll practice in a sandbox repository. That way, if things go south (or north for you all in Oz), you can nuke the sandbox and try again. $ cp -pr darktable darktable.sandbox $ cd darktable.sandbox $ git with reckless abandon Bruce Williams <stu...@audio2u.com> wrote: > So, I did this: > > bruce@admin:~/Downloads/darktable-dev/darktable$ git checkout release-3.4.1 > error: The following untracked working tree files would be overwritten by > checkout: > src/tests/integration/0000-nop/expected.png > src/tests/integration/0000-nop/nop.xmp > src/tests/integration/0001-exposure/expected.png > src/tests/integration/0001-exposure/exposure.xmp > src/tests/integration/0002-local-contrast/expected.png > src/tests/integration/0002-local-contrast/local-contrast.xmp > src/tests/integration/0003-denoise-bilateral/denoise-bilateral.xmp > src/tests/integration/0003-denoise-bilateral/expected.png > src/tests/integration/0004-masks/expected.png > src/tests/integration/0004-masks/masks.xmp > src/tests/integration/0005-orientation-minus-90/expected.png > src/tests/integration/0005-orientation-minus-90/orientation-minus-90.xmp > src/tests/integration/0006-orientation-plus-90/expected.png > src/tests/integration/0006-orientation-plus-90/orientation-plus-90.xmp > src/tests/integration/0007-orientation-180/expected.png > src/tests/integration/0007-orientation-180/orientation-180.xmp > src/tests/integration/0008-flip-h/expected.png > src/tests/integration/0008-flip-h/flip-h.xmp > src/tests/integration/0009-flip-v/expected.png > src/tests/integration/0009-flip-v/flip-v.xmp > src/tests/integration/0010-flip-hv/expected.png > src/tests/integration/0010-flip-hv/flip-hv.xmp > src/tests/integration/0011-gdnd-90/expected.png > src/tests/integration/0011-gdnd-90/gdnd-90.xmp > src/tests/integration/0012-gdnd-45/expected.png > src/tests/integration/0012-gdnd-45/gdnd-45.xmp > src/tests/integration/0013-denoiseprofile-wavelets/denoiseprofile-wavelets.xmp > src/tests/integration/0013-denoiseprofile-wavelets/expected.png > src/tests/integration/0014-filmic-rgb/expected.png > src/tests/integration/0014-filmic-rgb/filmic-rgb.xmp > src/tests/integration/0015-shadhi-bilateral/expected.png > src/tests/integration/0015-shadhi-bilateral/shadhi-bilateral.xmp > src/tests/integration/0016-lowpass-bilateral/expected.png > src/tests/integration/0016-lowpass-bilateral/lowpass-bilateral.xmp > src/tests/integration/0017-monochrome/expected.png > src/tests/integration/0017-monochrome/monochrome.xmp > src/tests/integration/0018-perspective-corr/expected.png > src/tests/integration/0018-perspective-corr/perspective-corr.xmp > src/tests/integration/0019-color-mapping/color-mapping.xmp > src/tests/integration/0019-color-mapping/expected.png > src/tests/integration/0020-denoise-nlmeans/denoise-nlmeans.xmp > src/tests/integration/0020-denoise-nlmeans/expected.png > src/tests/integration/0021-retouch-wavelets/expected.png > src/tests/integration/0021-retouch-wavelets/retouch-wavelets.xmp > src/tests/integration/0022-color-zones/color-zones.xmp > src/tests/integration/0022-color-zones/expected.png > src/tests/integration/0023-channelmixer/channelmixer.xmp > src/tests/integration/0023-channelmixer/expected.png > src/tests/integration/0024-contrast-equalizer/contrast-equalizer.xmp > src/tests/integration/0024-contrast-equalizer/expected.png > src/tests/integration/0025-exposure-guided-filter/expected.png > src/tests/integration/0025-exposure-guided-filter/exposure-guided-filter.xmp > src/tests/integration/0026-haze-removal/expected.png > src/tests/integration/0026-haze-removal/haze-removal.xmp > src/tests/integration/0027-denoiseprofile-nlmeans/denoiseprofile-nlmeans.xmp > src/tests/integration/0027-denoiseprofile-nlmeans/expected.png > src/tests/integration/0028-highpass-overlay/expected.png > src/tests/integration/0028-highpass-overlay/highpass-overlay.xmp > src/tests/integration/0029-color-correction/color-correction.xmp > src/tests/integration/0029-color-correction/expected.png > src/tests/integration/0030-framing/expected.png > src/tests/integration/0030-framing/framing.xmp > src/tests/integration/0031-globaltonemap-drago/expected.png > src/tests/integration/0031-globaltonemap-drago/globaltonemap-drago.xmp > src/tests/integration/0032-watermark/expected.png > src/tests/integration/0032-watermark/watermark.xmp > src/tests/integration/0033-blending-modes-uniform/Readme.md > src/tests/integration/0033-blending-modes-uniform/blending-modes-uniform.xmp > src/tests/integration/0033-blending-modes-uniform/expected.pn > Aborting > > What have I missed? > Sorry for the noob questions. This is like trying to learn a language from > another planet. :) > Cheers, > Bruce Williams > ------------------------------ > brucewilliamsphotography.com > shuttersincpodcast.com > > e-mail | Twitter | LinkedIn | Facebook | Soundcloud | Quora > ------------------------------ > > ____________________________________________________________________________ > darktable user mailing list to > unsubscribe send a mail to darktable-user+unsubscr...@lists.darktable.org > = > > ---------------------------------------------------- > Alternatives: > > ---------------------------------------------------- -- Bill Wohler <woh...@newt.com> aka <bill.woh...@nasa.gov> http://www.newt.com/wohler/, GnuPG ID:610BD9AD ____________________________________________________________________________ darktable user mailing list to unsubscribe send a mail to darktable-user+unsubscr...@lists.darktable.org
