Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h#195
Merged
Conversation
plexoos
requested review from
akioogawa,
jml985,
kehw and
tonko-lj
as code owners
akioogawa
approved these changes
Nov 15, 2021
Member
|
Looks good to me. If no objection, I would recommend to merge this in. |
starsdong
approved these changes
Nov 17, 2021
plexoos
added a commit
to plexoos/star-sw
that referenced
this pull request
Nov 18, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194
veprbl
pushed a commit
to veprbl/star-sw
that referenced
this pull request
Dec 3, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319)
jml985
pushed a commit
that referenced
this pull request
Dec 7, 2021
marrbnl
pushed a commit
that referenced
this pull request
Dec 8, 2021
plexoos
added a commit
that referenced
this pull request
Dec 13, 2021
plexoos
added a commit
to plexoos/star-sw
that referenced
this pull request
Dec 13, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319)
plexoos
added a commit
to plexoos/star-sw
that referenced
this pull request
Dec 13, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (star-bnl#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 13, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this pull request
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589) Rename file to avoid name conflict on case insensitive systems StarVMC/StarBASE/macros/differential.py -> StarVMC/StarBASE/macros/differentiate.py The files with conflicting names are: StarVMC/StarBASE/macros/differential.py StarVMC/StarBASE/macros/Differential.py (cherry picked from commit 0203666) Resolve file name collision by moving test macro The files with conflicting names on case insensitive systems are: StRoot/macros/test/micky.C StRoot/macros/test/Micky.C micky.C is a macro testing a class in St_baseTest (cherry picked from commit 1e2f63a)
plexoos
added a commit
that referenced
this pull request
Dec 23, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h
Removing it resolves #194. For details see #194