Comment 3 for bug 417210
Revision history for this message
| Alexander Belchenko (bialix) wrote Re: [Bug 417210] Re: error message when using TortoiseBZR to commit | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
a60fb26
(Get the code!)
lgendarydrew пишет:
> Yes, that happens when I've tried to commit just a few files - committing the whole tree works.
> However, I wasn't aware that I did a merge. What happened was I did an update from an SVN repository, which resulted in a file conflict.
I suspect you're using checkout (centralized workflow) and on update bzr did implicit merge of your
local changes with upstream. This is most likely happens after one or several local commits.