Re: Fwd: [darktable-user] Question about github

2021-02-07 Thread Bill Wohler
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

Re: Fwd: [darktable-user] Question about github

2021-02-07 Thread Bernhard
Hi I'm also only a casual user of git/github, but Bruce Williams schrieb am 07.02.21 um 03:17: 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:

Fwd: [darktable-user] Question about github

2021-02-06 Thread Bruce Williams
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/-nop/expected.png src/tests/integration/-nop/nop.xmp