From 03ca606f0df7c0066445d8e295c91c58504faea3 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 09:48:15 +0900 Subject: [PATCH 01/19] add newfile --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From c8317d2e82780af3117787c3ca75d03387e45db5 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 10:55:39 +0900 Subject: [PATCH 02/19] change name --- newfile.txt => namechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechanged.txt (100%) diff --git a/newfile.txt b/namechanged.txt similarity index 100% rename from newfile.txt rename to namechanged.txt From 645cc5dcf36f2792a8d1f118e2e39cdfe4bc5377 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 10:59:44 +0900 Subject: [PATCH 03/19] change name again --- README.md | 1 + namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..7912c298c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更！！ \ No newline at end of file diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From 0b8c1a1d1fdae6507ed8ff55ac33fa0d84207f88 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 11:10:25 +0900 Subject: [PATCH 04/19] make newfile --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From 0d4c13d2023ea06cf995d16344492f9967795d65 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 11:11:43 +0900 Subject: [PATCH 05/19] delete file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt deleted file mode 100644 index e69de29bb..000000000 From aae27e2ca2678b7b237b209e79d9f9336f22d28d Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 11:13:48 +0900 Subject: [PATCH 06/19] make new file again --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From 4ccfb9508f06bf123e1ba924c83b2ec06e89aa6f Mon Sep 17 00:00:00 2001 From: giita-jp Date: Thu, 12 Feb 2026 11:30:58 +0900 Subject: [PATCH 07/19] make gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9aa6a64e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log From 358cb226985d4bf5e8ce5d83724d015d4f366123 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Fri, 13 Feb 2026 19:17:15 +0900 Subject: [PATCH 08/19] update readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7912c298c..e0a85eb8e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更！！ \ No newline at end of file +ローカルリポで変更！！ + +変更したぞ〜〜！！ \ No newline at end of file From 320862127de6d43f72739b2be4951b70eed157f7 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 17:51:17 +0900 Subject: [PATCH 09/19] edit README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e0a85eb8e..27f8d4911 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,5 @@ このリポジトリはGit動画講座用です． ローカルリポで変更！！ -変更したぞ〜〜！！ \ No newline at end of file +変更したぞ〜〜！！ +いや、しましたぞ！！ \ No newline at end of file From f8df91b0ecb5132282ebf9ca4b1c88ce2f5e632d Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 18:08:28 +0900 Subject: [PATCH 10/19] update readme automatic merge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 27f8d4911..9fae59255 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,6 @@ ローカルリポで変更！！ 変更したぞ〜〜！！ -いや、しましたぞ！！ \ No newline at end of file +いや、しましたぞ！！ + +本日は晴天なり \ No newline at end of file From 25d2255af2db2c968cd60704ca9e453e9afa5e75 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 18:12:40 +0900 Subject: [PATCH 11/19] make new file for automatic merge --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..aed4af38e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +山道を登りながら考えた。 \ No newline at end of file From 3e0398028a2bcc8b6758e009ebbcc0f938080731 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 18:24:03 +0900 Subject: [PATCH 12/19] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fae59255..c65eca240 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ 変更したぞ〜〜！！ いや、しましたぞ！！ -本日は晴天なり \ No newline at end of file +本日は晴天なれども波高し From c95c755643b0a004cab9ddffd68fa490748e28eb Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 18:26:34 +0900 Subject: [PATCH 13/19] update readme on main for conflict --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fae59255..0de3fd920 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,6 @@ 変更したぞ〜〜！！ いや、しましたぞ！！ -本日は晴天なり \ No newline at end of file +本日は晴天なり +いや、 +本日は雨なり \ No newline at end of file From 408bde1e6370ac150f84808d17cac6eca3994c3c Mon Sep 17 00:00:00 2001 From: giita-jp Date: Sat, 14 Feb 2026 18:39:11 +0900 Subject: [PATCH 14/19] update gitignore --- .gitignore | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) diff --git a/.gitignore b/.gitignore index 9aa6a64e3..299417244 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,218 @@ output.log + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[codz] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py.cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +# Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +# poetry.lock +# poetry.toml + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python. +# https://pdm-project.org/en/latest/usage/project/#working-with-version-control +# pdm.lock +# pdm.toml +.pdm-python +.pdm-build/ + +# pixi +# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control. +# pixi.lock +# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one +# in the .venv directory. It is recommended not to include this directory in version control. +.pixi + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# Redis +*.rdb +*.aof +*.pid + +# RabbitMQ +mnesia/ +rabbitmq/ +rabbitmq-data/ + +# ActiveMQ +activemq-data/ + +# SageMath parsed files +*.sage.py + +# Environments +.env +.envrc +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +# .idea/ + +# Abstra +# Abstra is an AI-powered process automation framework. +# Ignore directories containing user credentials, local state, and settings. +# Learn more at https://abstra.io/docs +.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 +# .vscode/ + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ + +# Streamlit +.streamlit/secrets.toml \ No newline at end of file From e33e36d934dd32b430a4db6b55e3597e3e7ec5e7 Mon Sep 17 00:00:00 2001 From: giita <76168757+giita-jp@users.noreply.github.com> Date: Mon, 16 Feb 2026 18:32:23 +0900 Subject: [PATCH 15/19] Fix typo in README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c363b426..ad8f2197b 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,6 @@ 変更したぞ〜〜！！ いや、しましたぞ！！ -本日は晴天なれども波高し +本日晴天なれども波高し +Github上で更新 From 911d3f76d29270ac6bea89f19d937c63d52b92c3 Mon Sep 17 00:00:00 2001 From: giita <76168757+giita-jp@users.noreply.github.com> Date: Mon, 16 Feb 2026 18:45:28 +0900 Subject: [PATCH 16/19] Update README to reflect further updates on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad8f2197b..2bfd137e4 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,4 @@ 本日晴天なれども波高し -Github上で更新 +Github上でさらに更新 From 188f20a69e1affd8b37287978fce05789954785e Mon Sep 17 00:00:00 2001 From: giita-jp Date: Mon, 16 Feb 2026 18:48:14 +0900 Subject: [PATCH 17/19] update reademe on conflict-remote for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad8f2197b..cef77b92a 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,4 @@ 本日晴天なれども波高し -Github上で更新 +conflict-remote上で更新 From 7626ab6e4d6e5f6ec735ae13c8e798a0184e32b6 Mon Sep 17 00:00:00 2001 From: giita-jp Date: Tue, 17 Feb 2026 18:20:28 +0900 Subject: [PATCH 18/19] update readme at my local repo --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index ce292aba8..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更！！ - -変更したぞ〜〜！！ -いや、しましたぞ！！ - -本日晴天なれども波高し - -conflict-remote上で更新 - +自分のリポジトリで更新 \ No newline at end of file From 6d69c49cf3bff4e58f004caeb434dbac18bbc9b6 Mon Sep 17 00:00:00 2001 From: giita <76168757+giita-jp@users.noreply.github.com> Date: Wed, 18 Feb 2026 16:10:36 +0900 Subject: [PATCH 19/19] Update README with additional information --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 41714aff4..4c3ef5579 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -自分のリポジトリで更新 \ No newline at end of file +自分のリポジトリで更新 +rebase用