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

Sorry for hickup with merges #38

Closed
cpldcpu opened this issue Jul 14, 2020 · 2 comments
Closed

Sorry for hickup with merges #38

cpldcpu opened this issue Jul 14, 2020 · 2 comments

Comments

@cpldcpu
Copy link
Member

cpldcpu commented Jul 14, 2020

Sorry, the github plugin for VSCODE introduced a very confusing unintential merge when I tried to pull the latestest production branch:

grafik

I tried to roll it back but noticed that this actually reverted to an older version, so I reverted the reversion.

Looking into whats going on, I hope the current state is the right one.
@cmfcmf
Copy link
Member

cmfcmf commented Jul 14, 2020 •
edited
Loading

Maybe this setting fixes it in the future: https://code.visualstudio.com/updates/v1_28#_always-rebase-when-running-sync

@cpldcpu
Copy link
Member Author

cpldcpu commented Jul 14, 2020

That's a good idea, indeed. I am still quite confused how this happened. It seems like the head was merged into a minor change of mine after rebasing everything to the state of my repository.

@cpldcpu cpldcpu closed this as completed Jul 15, 2020
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
2 participants
@cmfcmf @cpldcpu