git confilict with revisioned .pyc files

[David Ames]

Occasionally juju will run into a git conflict due to revisioning temporary binary files like .pyc files and requires manual intervention.

Can juju be made to ignore binary temporary files?

Example:

2014-04-30 15:16:18 INFO juju deployer.go:150 worker/uniter/charm: preparing charm upgrade
2014-04-30 15:16:18 DEBUG juju.worker.uniter.filter filter.go:330 got config change
2014-04-30 15:16:18 DEBUG juju.worker.uniter.filter filter.go:334 preparing new config event
2014-04-30 15:16:18 INFO juju deployer.go:170 worker/uniter/charm: deploying charm
2014-04-30 15:16:21 ERROR juju git.go:188 worker/uniter/charm: git command failed: exit status 1
path: /var/lib/juju/agents/unit-u1-clickindex-app-0/charm
args: []string{"pull", "/var/lib/juju/agents/unit-u1-clickindex-app-0/state/deployer/current"}
From /var/lib/juju/agents/unit-u1-clickindex-app-0/state/deployer/current
 * branch HEAD -> FETCH_HEAD
warning: Cannot merge binary files: lib/charmhelpers/fetch/__init__.pyc (HEAD vs. 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268)

warning: Cannot merge binary files: lib/charmhelpers/core/host.pyc (HEAD vs. 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268)

warning: Cannot merge binary files: lib/charmhelpers/contrib/templating/contexts.pyc (HEAD vs. 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268)

CONFLICT (modify/delete): lib/charmhelpers/fetch/archiveurl.pyc deleted in HEAD and modified in 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268. Version 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268 of lib/charmhelpers/fetch/archiveurl.pyc left in tree.
Auto-merging lib/charmhelpers/fetch/__init__.pyc
CONFLICT (content): Merge conflict in lib/charmhelpers/fetch/__init__.pyc
Auto-merging lib/charmhelpers/core/host.pyc
CONFLICT (content): Merge conflict in lib/charmhelpers/core/host.pyc
Auto-merging lib/charmhelpers/contrib/templating/contexts.pyc
CONFLICT (content): Merge conflict in lib/charmhelpers/contrib/templating/contexts.pyc
CONFLICT (modify/delete): lib/charmhelpers/contrib/hahelpers/cluster.pyc deleted in HEAD and modified in 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268. Version 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268 of lib/charmhelpers/contrib/hahelpers/cluster.pyc left in tree.
CONFLICT (modify/delete): lib/charmhelpers/contrib/hahelpers/apache.pyc deleted in HEAD and modified in 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268. Version 9c0bbc9b98ae98c3a0288168b1ee0c2e33306268 of lib/charmhelpers/contrib/hahelpers/apache.pyc left in tree.
Automatic merge failed; fix conflicts and then commit the result.

2014-04-30 15:16:22 DEBUG juju.worker.uniter.filter filter.go:314 got unit change
2014-04-30 15:16:22 WARNING juju deployer.go:99 worker/uniter/charm: charm deployment completed with conflicts
2014-04-30 15:16:22 DEBUG juju.worker.uniter modes.go:423 ModeUpgrading local:precise/click-index-134086001 exiting
2014-04-30 15:16:22 INFO juju.worker.uniter modes.go:421 ModeConflicted starting
2014-04-30 15:16:22 DEBUG juju.worker.uniter.filter filter.go:418 want resolved event
2014-04-30 15:16:22 DEBUG juju.worker.uniter.filter filter.go:412 want forced upgrade true
2014-04-30 15:16:22 DEBUG juju.worker.uniter.filter filter.go:523 no new charm event

On the host
root@juju-stag-u1-clickindex-machine-5:/var/lib/juju/agents/unit-u1-clickindex-app-0/charm# git diff
diff --cc lib/charmhelpers/contrib/templating/contexts.pyc
index a06f33b,586d81a..0000000
Binary files differ
diff --cc lib/charmhelpers/core/host.pyc
index 905fd13,0cab7e5..0000000
Binary files differ
diff --cc lib/charmhelpers/fetch/__init__.pyc
index db84204,b3b32cf..0000000
Binary files differ
* Unmerged path lib/charmhelpers/contrib/hahelpers/apache.pyc
* Unmerged path lib/charmhelpers/contrib/hahelpers/cluster.pyc
* Unmerged path lib/charmhelpers/fetch/archiveurl.pyc