After yesterdays git recap we had the opportunity to practice again :)
In particular we were assured that it is possible to reset any time to any commit, basically you can switch back and forth. (Changes should be on the feature branch whereas you'll reset the master branch. Is that correct?) This is how it is done:
Additionally we got some insights to why a rebase is preferable to a merge.
Besides the git stuff we briefly touched on matchers.
Also we looked for some more regular expressions which needed to get an updated syntax for rspec 3 in the capybara files.
This is our little program to change these (yes, the one we had hoped to finish by last Tuesday...):
In particular we were assured that it is possible to reset any time to any commit, basically you can switch back and forth. (Changes should be on the feature branch whereas you'll reset the master branch. Is that correct?) This is how it is done:
- in terminal check for changes which might get lost (git diff and git status, then one possibility is git stash)
- all is well? Then do git log (or check online on your GitHub account).
- copy ID of commit you wish to jump to
- enter git reset --hard 'chosen ID'
- git log should show that HEAD is at the chosen commit
Additionally we got some insights to why a rebase is preferable to a merge.
Besides the git stuff we briefly touched on matchers.
Also we looked for some more regular expressions which needed to get an updated syntax for rspec 3 in the capybara files.
This is our little program to change these (yes, the one we had hoped to finish by last Tuesday...):
Command to execute the file: ag -l '\.should' capybara_features/ | xargs ruby rspec22rspec3.rb
As today is Friday we had to explain all of this to Carolin and Michelle in our weekly retrospective. Hopefully that didn't go to muddleheaded....
Erik and Kathi, probably looking at some comics while running tests...
As today is Friday we had to explain all of this to Carolin and Michelle in our weekly retrospective. Hopefully that didn't go to muddleheaded....
Erik and Kathi, probably looking at some comics while running tests...