Skip to content

Instantly share code, notes, and snippets.

View sparrow's full-sized avatar

Volodymyr Vorobiov sparrow

90 followers · 0 following
View GitHub Profile
@sparrow
sparrow / hash
Last active October 17, 2016 14:45
This is a hash of the conflict commit. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
<<<<<<< HEAD
foo
=======
bar
>>>>>>> cb1abc6bd98cfc84317f8aa95a7662815417802d
@sparrow
sparrow / console
Last active October 17, 2016 14:45
We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git commit -m ‘rebase’ git push origin something-cool
@sparrow
sparrow / console
Last active October 17, 2016 14:45
This command will continue rebasing by entering. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git add git rebase --continue
@sparrow
sparrow / console
Last active October 17, 2016 14:45
This command will merge our new development with our feature branch. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git rebase development
@sparrow
sparrow / console
Last active October 17, 2016 14:46
This command will merge our new development with our feature branch. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git checkout feature/something-cool
@sparrow
sparrow / console
Last active October 17, 2016 14:46
This command will move the newest changes from the remote development branch to local branch. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git pull origin development
@sparrow
sparrow / console
Last active October 17, 2016 14:46
This command will push the project to GitHub. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git push -f origin feature/blog
@sparrow
sparrow / console
Last active October 17, 2016 14:47
This command will push the project to GitHub. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git push origin feature/blog
@sparrow
sparrow / console
Last active October 17, 2016 14:47
This command will commit changes. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git commit --amend
@sparrow
sparrow / console
Last active October 17, 2016 14:47
This command will commit changes. We used this command in our blog post https://rubygarage.org/blog/release-quality-code-with-github at RubyGarage
git commit -m ‘delete some files, fix some bugs’