opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Use Mix and sass, simplify image directories and remove duplicates

Browse source
This commit is contained in:
Oliver Davies 2018-05-18 21:41:26 +01:00
parent ad3bc4b0a2
commit ff29fdeb71
216 changed files with 2921 additions and 1096 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/_posts/2015-06-18-updating-forked-github-repos.md
View file

@ -55,12 +55,12 @@ $ git push origin master
This seems to have worked OK - the commits are still authored by the correct people and at the correct date and time - and I went ahead and created a new feature branch and pull request based on that master branch.
<figure>
<img src="/build/static/images/blog/forked-github-repo-commits.png" alt="The commits on my master branch after rebasing">
<img src="/build/images/blog/forked-github-repo-commits.png" alt="The commits on my master branch after rebasing">
<figcaption>The commits on my forked master branch after rebasing and pushing. All good!</figcaption>
</figure>
<figure>
<img src="/build/static/images/blog/my-commit-to-the-rebased-branch.png" alt="The new feature branch with my additional commit.">
<img src="/build/images/blog/my-commit-to-the-rebased-branch.png" alt="The new feature branch with my additional commit.">
<figcaption>The new feature branch with the new commit.</figcaption>
</figure>
@ -76,7 +76,7 @@ I believe that it will use an existing "upstream" remote if it exists, otherwise
Once you’ve completed the rebase, you can then push your updated branch either from the terminal, or using the *Push* command from the same menu.
![Rebasing a forked repository in PhpStorm using the VCS menu.](/build/static/images/blog/github-fork-rebase-phpstorm.png)
![Rebasing a forked repository in PhpStorm using the VCS menu.](/build/images/blog/github-fork-rebase-phpstorm.png)
It would be great to see something similar added to [hub](https://hub.github.com) too (I’ve created [an issue](https://github.com/github/hub/issues/1047))!