Update from original #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Patch mode add is an advanced topic that does not fit the level of this exercise and the time and way it is typically used in training.
Remove usage of patch mode add from 3-way-merge exercise
Instructions for Atom and Notepad++
The --decorate option is default in git log, and provides no value in the form where it is currently used in the examples.
Remove --decorate from katas
Added elaboration
Mention `touch` to create an empty file
Fix a typo: append missing closing brace
Style: mark 'file.txt' as code
Fix typos
Mark "git status" as code
Add learning path to README
…t-kata setup.sh and verify.sh should be executables in the bisect kata
Fixed README numbering, so that it now increments both in shell and in markdown
This allows `git rebase -i` to automatically go back to origin/master if no target tree'ish is specified.
Related issue: #261
Related issue: #261
Related issue: #261
Add `setup.ps1` to the README.md files.
Related issue: #261
If for whatever reason the `exercises` folder cannot be removed the `setup.ps1` script did not stop but continue running potentionally spilling a lot of error messages. With this change the failing deletion will stop the setup script. Resolves: #243
Co-authored-by: Jan Krag <jankrag@gmail.com>
As signing might be enabled globally, commits from setup scripts local user should happen without signing.
With this kata you can practice what does it take to change the authors of already committed and pushed commits. The idea sprang from a personal experience.
…ing via adding a new file.
Co-authored-by: Mads Jensen <mads.jensen@eficode.com>
This is a precursor to our upcoming release pipeline, where the katas are made accessible without cloning them down, causing the dreaded nested git repo confusion.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.