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.

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

Merge Feat b branch to master #400

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 feat-a-01.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file is on the feat-a branch.
1 change: 1 addition & 0 deletions feat-b-01.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file is on the feat-b branch.
1 change: 1 addition & 0 deletions master-01.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
This file is on the master branch.
This is my first edit.
1 change: 1 addition & 0 deletions master-02.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is the second file one the master brach.
1 change: 1 addition & 0 deletions master-03.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is the third file on the master branch.