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

Jump to bottom

Issue #3 Completed #2

Open
AhmadUCL opened this issue Oct 15, 2020 · 1 comment
Open

Issue #3 Completed #2

AhmadUCL opened this issue Oct 15, 2020 · 1 comment

Comments

@AhmadUCL
Copy link
Owner

AhmadUCL commented Oct 15, 2020 •
edited
Loading

Before:

$ git merge new-branch
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

After:

Ahmad@LAPTOP-Q4FRVGD3 MINGW64 ~/desktop/MergeConflict (master|MERGING)
$ git commit -am "fixed"
[master 779964f] fixed

Ahmad@LAPTOP-Q4FRVGD3 MINGW64 ~/desktop/MergeConflict (master)
$ git merge new-branch
Already up to date.

Code:

<<<<<<<HEAD
Hola

Hello World

new-branch

changed to

Hello World

Answers UCL-RITS#3
@AhmadUCL
Copy link
Owner Author

excuse the formatting (new to using github)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@AhmadUCL