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

Alias: add merge conflict detection mode #29

Open
OleksiyRudenko opened this issue May 11, 2020 · 0 comments
Open

Alias: add merge conflict detection mode #29

OleksiyRudenko opened this issue May 11, 2020 · 0 comments

Comments

@OleksiyRudenko
Copy link
Owner 

git checkout develop
git pull
git merge <release branch> --no-ff --no-commit

Undoing merge: git reset ORIG_HEAD --hard
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@OleksiyRudenko