| Prodi | i'm trying to figure out why i'm getting some weird conflicts when merge a branch back into the "trunk" | 01:21 |
|---|---|---|
| Prodi | and how to avoid getting them in the future, since this should be a conflict, as it's a straight file modification | 01:22 |
| Prodi | i branched my trunk into "branch" | 01:23 |
| Prodi | added file to branch | 01:23 |
| Prodi | merged back into trunk, worked fine | 01:24 |
| Prodi | modified that file on branch | 01:24 |
| Prodi | merged back into trunk, but the trunk "bzr log" doesn't seem to think i got the change from the branch, it thinks i made it locally | 01:24 |
| Prodi | new change to the file on the branch, trying to merge it in, and now i'm getting a file and file.moved as a conflict | 01:25 |
| === Prodi is now known as Prod[a] | ||
| Prod[a] | anyone know how to check the file-id of a file on the working tree? | 02:35 |
| fullermd | ls has a --show-ids | 02:54 |
| Prod[a] | cool thanks | 03:14 |
| Prod[a] | i'm trying to clean up these two trees i'm merging still | 04:48 |
| Prod[a] | and it seems that some of the files didn't get merged properly | 04:48 |
| Prod[a] | they were there in my original "trunk" | 04:48 |
| Prod[a] | and they're there in the branch | 04:48 |
| Prod[a] | but after the merge, the files have disappeared | 04:48 |
| === r0bby is now known as robbyoconnor | ||
| === yofel_ is now known as yofel | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!