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

git pull when merge conflict #3

Open
robnagler opened this issue Dec 21, 2017 · 0 comments
Open

git pull when merge conflict #3

robnagler opened this issue Dec 21, 2017 · 0 comments

Comments

@robnagler
Copy link
Member

robnagler commented Dec 21, 2017 •
edited
Loading

During the git pull, there may be a merge conflict. At that point in the installer, it should warn the user that they need to merge, but still continue with the install.
@robnagler robnagler changed the title git pull when merge conflict 20230331 git pull when merge conflict Oct 14, 2022
@robnagler robnagler changed the title 20230331 git pull when merge conflict git pull when merge conflict Apr 17, 2023
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
@robnagler