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

Split conflict resolution and staging into separate steps #175

Merged

sorenlouv merged 4 commits into master from split-conflicts-resolution-and-staging

Apr 7, 2020

Owner

sorenlouv commented Apr 7, 2020 •

edited

Loading

sorenlouv added 4 commits

April 7, 2020 14:57


          Split conflict resolution and staging into separate steps

22d4859


          Add visual linebreaks


          Minor copy fixes

edd8f3e


          update snapshot

004db64

sorenlouv merged commit 07493c3 into master

sorenlouv deleted the split-conflicts-resolution-and-staging branch

April 7, 2020 14:01

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

Labels

None yet