<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>Hi huyao,</div><div><br></div><div>Conflicts are not necessarily are blocking point for the merge. You can always manually resolve the conflicts using "git mergetool" using your favorite merging app. Having or not having github account is kind of irrelevant here.</div><div><br></div><div>Having said that, I continue to advocate a modular approach for simulation scenarios. That is, in most of the cases you don't really need to modify ndnSIM internals, as almost everything can be done in the form of extensions, and if something is not, I would be glad to include it to ndnSIM. </div><div><br></div><div>You can use one of these examples <a href="http://ndnsim.net/getting-started.html#simulating-using-ndnsim">http://ndnsim.net/getting-started.html#simulating-using-ndnsim</a> as a starting point. This way you will be able to update to the latest ndnSIM without creating any conflict, since you will not be modifying ndnSIM code. Another plus, you can easily track your changes in your scenarios, as well as bundle your scenarios with other relevant information (topologies, graph building scripts, etc.).</div><div><br></div><div>---</div><div>Alex</div><br><div><div>On Mar 27, 2013, at 7:30 PM, yao hu <<a href="mailto:huyao0107@gmail.com">huyao0107@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Hi Alex,<div><br></div><div>I downloaded ndnsim source without a github account, like</div><div><pre style="overflow-x:auto;overflow-y:hidden;padding:5px;line-height:14px;border-top-width:1px;border-bottom-width:1px;border-style:solid none;border-top-color:rgb(170,204,153);border-bottom-color:rgb(170,204,153);font-size:12px">git clone git://<a href="http://github.com/NDN-Routing/ndnSIM.git">github.com/NDN-Routing/ndnSIM.git</a> ns-3/src/ndnSIM</pre></div><div>which is wihout `wirte` access. Now I have modified some codes and want to merge them with the latest ndnsim codes on ndnsim project. I tried commit and pull from the ndnsim repository but conflicts happened and it does not work. So I re-downloaded the latest version of ndnsim source and added my modification into it again. Now it works. </div>
<div><br></div><div>My question is for the future use how to merge my ndnsim modification into the latest version of ndnsim without a github account?</div><div><br></div><div>Thanks for your help in advance! </div><div><br>
</div><div>Regards,</div><div>huyao</div>
_______________________________________________<br>ndnSIM mailing list<br><a href="mailto:ndnSIM@lists.cs.ucla.edu">ndnSIM@lists.cs.ucla.edu</a><br>http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim<br></blockquote></div><br></body></html>