Skip to content

Hot fix #1

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
decrystal wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hot fix #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f6dce3
test conflict
Nov 5, 2019
32a6549
finally edit
Nov 5, 2019
53d5cdf
origin_ssh
Nov 9, 2019
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: 2 additions & 2 deletions apple.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aaaaaa
aaaaa
bbbbbb =edit by master
cccccc=abcdef==edit by hot-fix

edit by _ssh