Matěj Cepl
2013-08-12 16:23:50 UTC
Hi,
I were doing rather large rebase on one of my repos, and I had still
endless problems with merge conflicts of .be/id-cache file. According to
http://thread.gmane.org/gmane.comp.bug-tracking.bugs-everywhere.devel/730 this
file is just a cache and could be regenrated. In order to avoid these
merge conflicts is either of these options possible?
1) put .be/id-cache into .gitignore (or .git/info/exclude)?
2) do something to BE, that it wouldn't generate the cache at all? I
would gladly sacrifice couple of miliseconds per be list for many
minutes of resolving crazy merge conflicts during git rebase. Is there
such configuration option?
Best,
Mat?j
--
http://www.ceplovi.cz/matej/, Jabber: mcepl at ceplovi.cz
GPG Finger: 89EF 4BC6 288A BF43 1BAB 25C3 E09F EF25 D964 84AC
The state is the great fictitious entity by which everyone seeks
to live at the expense of everyone else.
-- Frederick Bastiat
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 255 bytes
Desc: OpenPGP digital signature
URL: <http://void.printf.net/pipermail/be-devel/attachments/20130812/d848e06a/attachment.pgp>
I were doing rather large rebase on one of my repos, and I had still
endless problems with merge conflicts of .be/id-cache file. According to
http://thread.gmane.org/gmane.comp.bug-tracking.bugs-everywhere.devel/730 this
file is just a cache and could be regenrated. In order to avoid these
merge conflicts is either of these options possible?
1) put .be/id-cache into .gitignore (or .git/info/exclude)?
2) do something to BE, that it wouldn't generate the cache at all? I
would gladly sacrifice couple of miliseconds per be list for many
minutes of resolving crazy merge conflicts during git rebase. Is there
such configuration option?
Best,
Mat?j
--
http://www.ceplovi.cz/matej/, Jabber: mcepl at ceplovi.cz
GPG Finger: 89EF 4BC6 288A BF43 1BAB 25C3 E09F EF25 D964 84AC
The state is the great fictitious entity by which everyone seeks
to live at the expense of everyone else.
-- Frederick Bastiat
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 255 bytes
Desc: OpenPGP digital signature
URL: <http://void.printf.net/pipermail/be-devel/attachments/20130812/d848e06a/attachment.pgp>