commit leads to a merge nightmare
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
New
|
Undecided
|
Unassigned | ||
Bug Description
I was working offline and did a local commit to an up-to-date branch.
When trying to commit to the remote repository bzr tells:
Out of synch, run bzr update.
After the update there are so many files marked for merge that I have needed about 30min. of time to detect which was the one I was working on:
myfile.
myfile.
myfile.
myfile.txt.bib.THIS
myfile.
myfile.txt.bib.BASE
myfile.txt.bib
In fact, I had only changed the content of three files. But the result of the bzr update lead to a chaos.
Maybe I confused the workflow. But I would like to report this. maybe others are experiencing the same.
Could there be implemented a intermediate step in the process that ask the user which copy is the most recent one?
The one on the server or the local one...
| James Westby (james-w) wrote | #1 |
Hi Tim,
Thanks for taking the time to report this bug. This particular bug
has already been reported as bug 113809, so I have marked it as
a duplicate.
It is kind of asking you to tell it what to do, but in a more flexible way
than just picking one as the most recent. However, the bug means
that it is far more confusing than it needs to be.
Thanks,
James