viewer-development was moved to a new folder and a new viewer-development repo was recreated with a different set of changes in it that differs from the old one. This is why you got merge conflicts.~TM Date: Thu, 31 May 2012 19:31:49 -0700 From: nickyper...@yahoo.com To: opensource-dev@lists.secondlife.com Subject: [opensource-dev] recent viewer-development changes
I normally hg pull into a local base viewer-development repo and then cd into my work repo, hg fetch from base and it usually handles my local changes with a default merge cleanly. This last weeks changes did not cleanly merge with about 8-10 files requiring a run through kdiff3 merge tool. Then, at the end I still had extra references to llxuixml.lib in indra/newview/CMakeLists.txt. Any one else have merge issues with viewer-development? Is this the notice that viewer-release is to be used for open source development? Nicky _______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
_______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
