Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes step 3 #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Conversation

raemasae
Copy link

final

raemasae added 4 commits March 8, 2016 10:49
html, css changes step 1
add icons, update css
col-6, mobile responsiveness updates
mobile update
@raemasae
Copy link
Author

@epilande: Final Submission

@epilande
Copy link
Member

Please merge your changes-step-3 branch into your gh-pages branch. For more info on merging, check out https://help.github.com/desktop/guides/contributing/syncing-your-branch/#2-merge-your-local-upstream-branch-with-your-project-branch

Once you've merged your changes-step-3 branch to gh-pages, please create a new pull request from your gh-pages branch.

@raemasae
Copy link
Author

hi Manny,

i think i might have messed up the merging...please let me know...thanks

Rachel

On Wed, Mar 23, 2016 at 1:20 AM, Emmanuel Pilande [email protected]
wrote:

Please merge your changes-step-3 branch into your gh-pages branch. For
more info on merging, check out
https://help.github.com/desktop/guides/contributing/syncing-your-branch/#2-merge-your-local-upstream-branch-with-your-project-branch

Once you've merged your changes-step-3 branch to gh-pages, please create
a new pull request from your gh-pages branch.


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#6 (comment)

@epilande
Copy link
Member

@rarimoto looks like you've merged master into changes-step-3 branch, which is fine, but we want to merge changes-step-3 into gh-pages branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants