| |
| |
On 11/23/20 11:42 AM w1hkj wrote:
... Just one
issue in accessing the 1.3.5 git branch for local use:
...
dave@m90p:~/dev.git/fltk-rev$ git checkout -b b1.3 origin/branch-1.3
error: The following untracked working tree files would be overwritten
by checkout:
documentation/src/fltk-book.tex.in
Please move or remove them before you switch branches.
Aborting
Renaming the offending file allowed me to create the local branch.
FYI: documentation/src/fltk-book.tex.in is a generated file in FLTK 1.4
(master) whereas it was a source file (included in git) in FLTK 1.3
(branch-1.3). In 1.4 this file is created for instance when you run
`make pdf` in the 'documentation' folder.
Solution 1 (preferred): to avoid polluting the build directory in the
first place use CMake in an out-of-source build, e.g. in a subdirectory
(build) or anywhere else. Admittedly CMake support in 1.3 is not yet
complete, so you may want to use ...
Solution 2: always start with a *clean* working directory before you
switch branches (unless you know what you're doing and a non-clean
working copy is intended).
$ make distclean
should do the job, but if you really want to run a separate build it's
often better to use a fresh clone or (as I'm routinely doing) use `git
worktree` [1] to create a clean working tree from the *same* local git
repository.
Another way to clean your working copy is to use `git clean` [2].
HTH.
Thanks for the report anyway, but there's nothing we can or need to do
to "fix" this.
[1] $ git help worktree
[2] $ git help clean
--
You received this message because you are subscribed to the Google Groups "fltk.general" group.
To unsubscribe from this group and stop receiving emails from it, send an email to fltkgeneral+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/fltkgeneral/7b1bd9ca-1c90-6d52-2f00-187307d61e51%40online.de.
[ Direct Link to Message ] | |
|
| |
