| === wedgwood is now known as wedgwood_away | ||
| === sagaci is now known as jpickett | ||
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| jelmer | hi bzrers | 13:21 |
|---|---|---|
| fullermd | Sounds like you've got a mouth full of marbles. | 13:28 |
| === wedgwood_away is now known as wedgwood | ||
| === deryck is now known as deryck[lunch] | ||
| mariusko | Hi | 18:15 |
| mariusko | Why do I need to resolve a conflict multiple times when doing multiple merges? | 18:15 |
| mariusko | In git, I just do it once | 18:15 |
| mariusko | http://bazaar.launchpad.net/~mariusko/charms/precise/node-app/trunk | 18:18 |
| mariusko | Revision #34 was also resolved | 18:18 |
| mariusko | I mean lost | 18:19 |
| === deryck[lunch] is now known as deryck | ||
| === bsd is now known as cdemarco | ||
| === cdemarco is now known as bsd | ||
| spiv | mariusko: because rev 36 removed that file and added a new file with the same name | 19:23 |
| spiv | mariusko: even though it's the same name bzr considers it to be a completely different file. This property (files having an identity separate to their name) works great for merging changes involving file renames | 19:24 |
| spiv | mariusko: but it's not so good in this sort of case | 19:25 |
| spiv | It might be nice if bzr merge had a --ignore-file-id option or something to do merging git-style, but I can imagine all sorts of nasty edge cases that would need careful thought. | 19:26 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!