Skip to content

CHANGED: made instructions less open for malicious interpretation. #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
haakonmb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CHANGED: made instructions less open for malicious interpretation. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion exercises/exercise-3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ A merge tool is a tool that compare different versions of a file side by side an

- Configure git to use KDiff3 as the default merge tool.

- Type the following from the Stack Owerflow post into your terminal without copy & pasting http://stackoverflow.com/a/33348841
- Type the listed commands from the following Stack Owerflow post into your terminal without copy & pasting http://stackoverflow.com/a/33348841

- Go to https://github.com/nerdschoolbergen/git-mergedemo
* In the "Branches" dropdown list, verify that there are 3 branches: master, develop, and conflict.
Expand Down