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

merge Settings/master #424

Merged
merged 2 commits into from
Sep 19, 2017
Merged

merge Settings/master #424

merged 2 commits into from
Sep 19, 2017

Conversation

dmfs
Copy link
Owner

@dmfs dmfs commented Sep 14, 2017

@lemonboston please resolve conflicts

@lemonboston
Copy link
Contributor

lemonboston commented Sep 15, 2017 •
edited
Loading

I've squashed and rebased on master but I haven't pushed because I am not sure this is what you wanted.. do you want to keep the 2 commits, or is it okay to force push the squashed, rebased, resolved version with message: "Settings screen with Notification singal settings. #279 #305" ?

@dmfs
Copy link
Owner Author

dmfs commented Sep 15, 2017

We should keep these two commits separate. Only the commit which resolves the conflict should be squashed with the commit which caused the conflict.

@lemonboston
Copy link
Contributor

lemonboston commented Sep 18, 2017 •
edited
Loading

Ok, I've rebased it, resolving conflicts without squashing.

@lemonboston lemonboston assigned dmfs and unassigned lemonboston Sep 18, 2017
@dmfs dmfs merged commit 6d5db7b into master Sep 19, 2017
@dmfs dmfs deleted the settings/master branch September 19, 2017 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dmfs dmfs

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dmfs @lemonboston