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 error when we want to update #37

Open
arhimede opened this issue May 14, 2024 · 0 comments
Open

git pull error when we want to update #37

arhimede opened this issue May 14, 2024 · 0 comments

Comments

@arhimede
Copy link
Member

From https://github.com/dotkernel/development
6eff679..48efc1c main -> origin/main

  • [new branch] arhimede-patch-1 -> origin/arhimede-patch-1
  • [new branch] arhimede-patch-2 -> origin/arhimede-patch-2
    Updating 6eff679..48efc1c
    error: Your local changes to the following files would be overwritten by merge:
    wsl/config.yml
    Please commit your changes or stash them before you merge.
    Aborting
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
@arhimede