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

Fix commit history on master #134

Merged
merged 2 commits into from
Mar 13, 2019
Merged

Fix commit history on master #134

merged 2 commits into from
Mar 13, 2019

Conversation

liamsi
Copy link
Contributor

@liamsi liamsi commented Mar 13, 2019

master and develop diverged here. Merge develop into master (and then master back into develop)
image

@liamsi
Copy link
Contributor Author

liamsi commented Mar 13, 2019

resolving the merge conflicts here created a commit on develop. Now we are here:
image

@liamsi
Copy link
Contributor Author

liamsi commented Mar 13, 2019 •
edited
Loading

If we merge this into master, this will create a linear history on both branches.

@liamsi liamsi merged commit a0c58a2 into master Mar 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@liamsi