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.

Sign up for GitHub

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

Jump to bottom

Rose #11

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

Rose #11

wants to merge 2 commits into from

Conversation

maryannet
Copy link

first post

@missaugustina
Copy link
Member

To fix these conflicts, 1) get the latest updates from the master branch (git checkout master; git pull origin master); 2) check out this branch "git checkout rose"; 3) update it against master using git rebase "git rebase master"; 4) push the updates to Github so we can see them! (git push origin rose)

@missaugustina missaugustina self-requested a review October 4, 2018 03:26
missaugustina
missaugustina requested changes Oct 4, 2018
View reviewed changes
Copy link
Member

@missaugustina missaugustina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch needs to be updated with the latest changes from master. See my earlier comment on how to do that. Anyone can do this, it doesn't have to be the owner of the branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@missaugustina missaugustina missaugustina requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maryannet @missaugustina