Working with branches in git
This is a good description of working with merging or rebasing in git. What they do and how to deal with them
Merging vs Rebasing (from Atlasian) Show archive.org snapshot
Related cards:
Cleaning up feature branches in git
After working on a feature in a separate branch, keeping the branch around is unnecessary. To clean up afterwards, run the following:
git push origin --delete <branch_to_delete>
git branch -D <branch_to_delete>
How to find a change in a commit in git?
Use git log
:
git log -S <String to search for> --author <author to restrict by, usually it's you> --since <how long since you made the change>
nutrella - create a Trello board based on a git branch
Rationale: Working in a git feature branch is convenient, the Trello board acts as a simple todo list specific to that work. Useful for sharing thoughts with other people also working on the branch
Fixing a git repo
If git complains with this error:
fatal: bad object refs/remotes/origin/HEAD
error: failed to run repack
This may happen if upstream branches have been removed and your origin is pointing to it. You can confirm this by running:
Ruby meta programming intro
An article on meta-programming in ruby. Source to use as inspiration for screenplay pattern in ruby
Build your own RSpec - introduction to DSL and metaprogramming
Specifying constants in Cucumber Transforms
Usually a cucumber step definition will have some sort of regular expression capture:
Given(/^I have (\d+) dollars in my account$/) do |amount|
#step logic
end
As the Given is specified above the amount argument will still be a st...
Wishing Retrospective
This retrospective was run as part of an employee on boarding experience. It was a small group (3 participants).
Goal: Where are we, what does success look like? (Futurespective)
Time: 1 hr
Structure
- Weather Report (set the stage)
- ...
Removing the @ Hack in Rails Controllers
Article on rails about not using @vsrisbles in controllers. Really nice approach
BDD Stuff
Acceptance criteria should give a binary yes/no response. They need to be ambiguous in order to test them. Without the binary response it is unclear whether the system is complete and behaves as intended (Writing Great Specifications p. 86)
Speci...
Moving some files from one commit to another branch
Say you've added a few files to a commit and you decide later to move it to a different branch. You need a couple of git commands:
First. You need to split the commit into multiple commits which done via an interactive rebase:
- `git rebase -i HE...