[Bug 340726] Re: Daily autocommits lead to frequent conflicts

[Chris Conway]

It's not sufficient to put "resolvconf/run" and
"cups/subscriptions.conf*" in .bzrignore. They must also be removed from
the repo. I.e., from an up-to-date state:

  $ bzr rm --keep resolvconf/run cups/subscriptions.conf*
  $ bzr commit -m "Removing volatile files"
  $ bzr ignore resolvconf/run 'cups/subscriptions.conf*'
  $ bzr commit -m "Ignoring volatile files"

-- 
Daily autocommits lead to frequent conflicts
https://bugs.launchpad.net/bugs/340726
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs