Skip to content

My First Pull Request #9

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

Closed
kumaravel-git wants to merge 25 commits into from
Closed

My First Pull Request #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f585e70
My First commit
Oct 12, 2020
c665804
Added files recursively
Oct 12, 2020
c36cf6c
Updated second.txt
Oct 12, 2020
143d8cb
renamed second.txt via git
Oct 12, 2020
9c3cfe2
Added renamed file via windows
Oct 12, 2020
d5accbb
renmaed via windows
Oct 12, 2020
e9553f3
added logs folder in gitignore
Oct 13, 2020
f470e4d
Added remote-file.txt
kumaravel-git Oct 13, 2020
abb7176
Merge branch 'master' of https://github.com/Kumararavel/example.java.…
Oct 13, 2020
525fe6e
Added differences into local repo
Oct 13, 2020
190eeb8
Alex adding in simple-changes branch
Oct 13, 2020
b13d4c1
Changes made in master
Oct 13, 2020
b51cbad
merged manually simple-changes branch
Oct 13, 2020
a3e5e74
Ignored .orig files which were used during merging process
Oct 13, 2020
5083258
Added before rebase
Oct 13, 2020
826df74
added in rebase-branch
Oct 13, 2020
c0008f7
Merged both rebase changes and branch changes
Oct 13, 2020
619dfdd
Added in master before big trouble branch is modified
Oct 13, 2020
a6fa4be
Added in master before rebase abort
Oct 13, 2020
9f79ab6
Added before rebasing in big-trouble
Oct 13, 2020
c4048e5
In big-trouble, 2nd attempt
Oct 13, 2020
0d0691a
added in big-trouble branch
Oct 13, 2020
35e016e
remote: changed this file.
kumaravel-git Oct 13, 2020
0b5ce61
remote: changed this text.
kumaravel-git Oct 13, 2020
85d4d80
remote: changed second time
kumaravel-git Oct 13, 2020
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*


logs/
*.orig
3 changes: 3 additions & 0 deletions first.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

Some text added
This is next line
1 change: 1 addition & 0 deletions level1/level1-file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is level1 file.txt
1 change: 1 addition & 0 deletions level1/level2/level2-file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is my level2.txt file
6 changes: 6 additions & 0 deletions remote-file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This files is added in remote git hub.

Added a line

another line here...

6 changes: 6 additions & 0 deletions second-renamed-via-windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
remote: changed this text by kumar
remote: added second line