On Apr 20, 2010, at 9:03 AM, Saint, David (David) wrote: > I'm seeing a bunch of extra files included every time I merge; > any idea why they're there and how to eliminate them? > > Changed files: > * extras/doggerel > * > * sipXopenfire/src/presence-plugin > * lib/freeswitch/upgradenotes.txt > * sipXpbx/etc/phonelog.conf > * sipXopenfire/presence-plugin/plugin.xml > * sipXopenfire/presence-plugin/web >
The merges are for file attributes and not for actual file content. Why they keep turning up as merge candidates I do not know but there is no harm in merging them if / when they show up. -Mardy _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev sipXecs IP PBX -- http://www.sipfoundry.org/
