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.

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

Unable to submit if someone else committed to the branch #63

Open
DamirHalilovic opened this issue Apr 17, 2019 · 0 comments
Open

Unable to submit if someone else committed to the branch #63

DamirHalilovic opened this issue Apr 17, 2019 · 0 comments
Assignees

Comments

@DamirHalilovic
Copy link

Hello,

There's a small difference in how the PlasticSCM client and the plugin handle submitting files. If I edited some files, and someone else submitted to my branch in the meantime, PlasticSCM will tell me (Paraphrasing) "New changes appeared but you can merge them safely do you want to do that and submit?" and I just click yes and everything resolves smoothly. The plugin however will just cancel the submit and I need to do the action through the PlasticSCM GUI because I can't update the workspace with pending changes.

Best regards,
Damir H.

@SRombauts SRombauts self-assigned this Apr 27, 2019
SRombautsU pushed a commit that referenced this issue Jan 31, 2023
Fix shelving files could lead to losing some changes previously shelved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants