Merge 5257be1f0e into 52f5a2bf57

Merge pull request #4788 from Rubens-Forks/patch-1
Remove trailing spaces and rewrap to 100 columns
2026-10-31 15:12:36 +01:00 · 2026-09-02 10:41:19 +09:00 · 2026-09-01 16:28:36 -07:00 · 2026-08-25 10:02:49 -07:00 · 2026-08-25 08:20:34 +03:00 · 2026-01-21 14:43:36 +01:00
2 changed files with 8 additions and 4 deletions
@@ -4,6 +4,7 @@

 # Files generated by invoking Julia with --track-allocation
 *.jl.mem
+*.jl.*.mem

 # System-specific files and directories generated by the BinaryProvider and BinDeps packages
 # They contain absolute paths specific to the host computer, and so should not be committed
@@ -26,3 +27,6 @@ Manifest*.toml
 # File generated by the Preferences package to store local preferences
 LocalPreferences.toml
 JuliaLocalPreferences.toml
+
+# Conda environment and metadata created in the project directory by the CondaPkg package
+.CondaPkg/
@@ -197,10 +197,10 @@ cython_debug/
 .abstra/

 # Visual Studio Code
-#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
-#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
-#   you could uncomment the following to ignore the entire vscode folder
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore that
+#   can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, you
+#   could uncomment the following to ignore the entire vscode folder
 # .vscode/
 # Temporary file for partial code execution
 tempCodeRunnerFile.py
Author	SHA1	Message	Date
Anstro Pleuton	6a2bec1b7a	Merge `5257be1f0e` into `52f5a2bf57`	2026-09-02 10:41:19 +09:00
Devin Dooley	52f5a2bf57	Merge pull request #4788 from Rubens-Forks/patch-1 Remove trailing spaces and rewrap to 100 columns	2026-09-01 16:28:36 -07:00
Devin Dooley	32652622a4	Merge pull request #4741 from sundowatch/julia Julia: ignore .jl..mem and CondaPkg's project-local environment	2026-08-25 10:02:49 -07:00
ibrahimandClaude Opus 5	8f80fc38c9	Julia: ignore .jl..mem and CondaPkg's project-local environment Replaces the previous contents of this branch, which added editor/OS and shared-library rules that belong in Global/ per the contributing guidelines. Two changes remain, both scoped to Julia.gitignore: * `.jl..mem` — `--track-allocation` writes `<file>.jl.<pid>.mem`, so the existing `.jl.mem` rule never matches the files Julia actually produces. This mirrors the `--code-coverage` section, which already carries both `.jl.cov` and `.jl..cov`. * `.CondaPkg/` — CondaPkg creates this directory inside the active project and populates it with a machine-specific Conda environment. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-08-25 08:20:34 +03:00
Rubén Pérez Alonso	a85a4c2ffd	Remove trailing spaces and rewrap to 100 columns Removed 2 trailing spaces and rewrapped the surrounding paragraph to 100 columns, consistent with the rest of the file.	2026-01-21 14:43:36 +01:00
ibrahim	40c5d3211c	remove __pycache__. Because this pattern is Python-specific; remove .julia_history. Because The .julia_history pattern is redundant since .history would already match it	2025-10-04 09:04:10 +03:00
ibrahim	d8635c69ba	Add ignore rules for Revise package files and common editor/OS temporary files in Julia projects	2025-10-04 08:53:35 +03:00