want per-file configuration to turn off automatic merging
Bug #548484 reported by
Martin Pool
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Bug Description
I have text files created by a 3rd party tool that I'd like to keep in bzr. When two guys work on this file, I expect bzr will auto-merge the two files and the 3rd party tool will not function anymore. I can identify these files by some extension (e.g *.3rd)
Is there some way to tell bzr to handle "*.3rd" files like it handles images? Essentially, no merging will take place. I assume the version that was checked in last will be kept.
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| tags: | added: merge |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: check-for-breezy |
To post a comment you must log in.
See recent thread "Turn off file content merge on pull/merge"
----
Is it possible to completely disable any content merging by bazaar?
I'd very much prefer if it would require me to merge manually if ANY
conflict in the content occurs. We had some problems recently with
it merging automatically two corrected files resulting in loosing
my local tested copy of work - because instead of reporting a
conflict it merged in somebody's else changes, which partly
duplicated my work.
There's no way to tell it NOT to merge contents of text files during
pull and this is sort of scary, because it require to check manually
the content of all pulled files which were automatically merged.
Also, I've seen a couple of articles recently on how 3-way merging
can be harmful. So... would be nice to be able to turn it off completely.