Skip to content
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

New feature #1269

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

New feature #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7c87664
add newfile
takataka0805 Oct 6, 2024
886bf58
change name
takataka0805 Oct 6, 2024
6829f23
change name again
takataka0805 Oct 6, 2024
f574e59
make new file
takataka0805 Oct 6, 2024
203d420
deleat file
takataka0805 Oct 6, 2024
3479fed
new file
takataka0805 Oct 6, 2024
890d164
add gitignore
takataka0805 Oct 7, 2024
2c113d1
push
takataka0805 Oct 7, 2024
f8f9db8
update readme
takataka0805 Oct 9, 2024
c3fff58
make new file for automatic merge
takataka0805 Oct 10, 2024
edef9b2
update readme for conflict
takataka0805 Oct 10, 2024
56f8601
update readme on main for conflict
takataka0805 Oct 10, 2024
a4f4d1d
resolve conflict
takataka0805 Oct 10, 2024
2abb32c
Update README on github
takataka0805 Oct 11, 2024
883b4fa
Update README　on github for conflict
takataka0805 Oct 11, 2024
712de39
update readme on conflict
takataka0805 Oct 11, 2024
934c8a9
Merge branch 'main' into conflict-remote
takataka0805 Oct 11, 2024
5bf3ce3
Merge pull request #1 from takataka0805/conflict-remote
takataka0805 Oct 11, 2024
9b08c08
make new file on main
takataka0805 Oct 12, 2024
17f730a
update readme at my repo
takataka0805 Oct 11, 2024
01e3c6a
update readme on rebase-practice
takataka0805 Oct 12, 2024
3c1fb76
update readme on main for conflict
takataka0805 Oct 13, 2024
949a2bf
Update readme for rebase pull
takataka0805 Oct 13, 2024
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# git-practice
このリポジトリはGit動画講座用です．
ローカルリポで更新
mainブランチで更新（rebase コンフリクト用）
rebase pull用
1 change: 1 addition & 0 deletions another_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
新しいファイルをメインで作成
Empty file added delete_soon.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions namechanged2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
newfile作成
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 @@
created new file