[15:23] <sidi> Is it possible to use bzr fast-import to keep syncing the master branch of a bzr repo with that of a git repo?
[15:24] <sidi> (I'm asking because I want to copy a git repo with one branch and a handful of release tags, then I want to make branches for some of those tags and apply my patches, but want to be able to create new branches for the git repo's future release tags and keep applying my patches all within Launchpad, so it can be packaged automatically)
[16:32] <stbatduke> Hello!
[16:32] <stbatduke> Quick question (hopefully):
[16:33] <stbatduke> "Conflict adding id to <filename>.  Unverseioned existing file <filename>."
[16:33] <stbatduke> Scenario:  Programmers my company hired does not know how to properly name files, so I had to change the names of a bunch of config files and csv files.
[16:34] <stbatduke> They updated one of these files this time around after I am forcing the file changes , and now one of the files I changed has been updated by the programmers
[16:35] <stbatduke> I need to add the file to the bzr repo however I am seeing this conflict in the bzr status, and I'm not sure how to just add this file to the repo, or how to merege the files updates into the renamed version of the file.
[16:56] <stbatduke> any ideas?