<html><body><div style="color:#000; background-color:#fff; font-family:times new roman, new york, times, serif;font-size:12pt"><div><span>Hi all,</span></div><div><span>I'm going to add code to cycles, but I encounter some problems.<br></span></div><div><span>My situation is:<br></span></div><div><span>1.I'm not a developer of Cycles, so I can't commit my code to Cycles branch</span><span></span><span></span><span>.</span></div><div><span>2.I checked out the Cycles branch source code to a directory, say it $(CyclesRoot), on my local machine. <br></span></div><div><span>3.If I modify the code of Cycles, I need to commit</span><span> the code to my local repository </span><span>with SVN or Git.<br></span></div><div><span>4.The source code of Cycles is updating everyday. <br></span></div><div><br><span></span></div><div><span>Let me take an example, I modified the file
</span><span>device.cpp</span><span>(</span><span>$(CyclesRoot)/</span><span>intern/cycles/device/device.cpp). Then I update the code in </span><span>$(CyclesRoot) to the latest version from Blender repository. </span><span></span><span> I resolve the conflict on device.cpp if there is. Now the problem occurs, how I commit device.cpp to my local repository?</span></div><div><span><br></span></div>Regards<br>yaoyansi<br><div><br></div><div><br><span></span></div><div><span></span></div><br> <div style="font-family: times new roman, new york, times, serif; font-size: 12pt;"> </div> </div></body></html>