search

jerome-toole / skindeep

1 stars 0 forks source link

Update develop from master #18

Closed briggySmalls closed 7 years ago

briggySmalls commented 7 years ago

Had a mare. Committed directly from iss11 branch to master (still haven't got used to merging within Github vs git). Bringing develop up to date with master.

jerome-toole commented 7 years ago

You shouldn't need to merge within github should you?

just pull, merge then push?

J

On Thu, Feb 2, 2017 at 1:39 AM, briggySmalls notifications@github.com wrote:

Had a mare. Committed directly from iss11 branch to master (still haven't got used to merging within Github vs git). Bringing develop up to date with master.

You can view, comment on, or merge this pull request online at:

https://github.com/jerome-toole/skindeep/pull/18 Commit Summary

  • Merge pull request #15 from jerome-toole/develop
  • WORK: Sanitise sftp-config
  • WORK: Create README.md
  • WORK: Correct README.md markdown
  • WORK: Further minor changes (attempting to trigger deploy)
  • WORK #8: Added date to article header
  • [#iss11] WORK: Improve masthead submenus
  • [iss#11] BUGFIX: Made header 'sticky'
  • [iss11] BUGFIX: Reinstated break to skindeep.js
  • WORK #11: Make masthead sticky and neater
  • Merge pull request #17 from jerome-toole/iss11

File Changes

Patch Links:

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/jerome-toole/skindeep/pull/18, or mute the thread https://github.com/notifications/unsubscribe-auth/AFRZOyzwOo1XDz7exy2Jnkhl_Nh8pyXKks5rYTPkgaJpZM4L0nnt .

-- 07963714722 @ http://twitter.com/jamronejamrone design.jerometoole.co.uk

briggySmalls commented 7 years ago

Yes it's true. I started off doing that. I thought Pull Requests might seem more traceable, but you're right, I think I'll switch back to doing it in Git locally.