Skip to content

New feature #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nn-sec wants to merge 20 commits into
base: main
Choose a base branch
from
Open

New feature #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9101af4
add newfile
nn-sec Jan 30, 2026
d6b3986
change name
nn-sec Jan 31, 2026
843c228
change name again
nn-sec Jan 31, 2026
9f08d51
make new file
nn-sec Jan 31, 2026
6bf4fe4
delete file
nn-sec Jan 31, 2026
d95fdc3
new file
nn-sec Jan 31, 2026
49548b5
add gitignore
nn-sec Jan 31, 2026
9103fff
updete_readme
nn-sec Jan 31, 2026
4dd10a3
update readme for autmatic merge
nn-sec Jan 31, 2026
2dbe5a3
make new file for automatic merge
nn-sec Jan 31, 2026
d6e075e
Merge branch 'no-fast-forward'
nn-sec Jan 31, 2026
e2cef1a
update readme on conflict branch for conflict
nn-sec Feb 1, 2026
f39e2a1
update readme on conflict branch for conflict
nn-sec Feb 1, 2026
ebd0ace
resolve
nn-sec Feb 1, 2026
b7c9605
Update README.md
nn-sec Feb 1, 2026
ce5fa25
Update README.md
nn-sec Feb 1, 2026
d32b92f
update readme on conflict-remote for conflict
nn-sec Feb 1, 2026
8f141c2
resolve conflict
nn-sec Feb 1, 2026
6dade75
Merge pull request #1 from nn-sec/conflict-remote
nn-sec Feb 1, 2026
472258a
update readme at my repo
nn-sec Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
output.log
3 changes: 3 additions & 0 deletions READ.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
conflict
ブランチで変更

3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# git-practice
このリポジトリはGit動画講座用です．
ローカル練習用
自分のリポジトリで更新
Empty file added delete_soon.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions namechanged2.text
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9mon 作成
1 change: 1 addition & 0 deletions newfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0mon OK