Thread: Merging two assembly files?
View Single Post
  #1   Spotlight this post!  
Unread 11-02-2008, 18:49
Drakan290 Drakan290 is offline
Registered User
FRC #0116
  
Join Date: Jan 2008
Location: Herndon, VA
Posts: 4
Drakan290 is a splendid one to beholdDrakan290 is a splendid one to beholdDrakan290 is a splendid one to beholdDrakan290 is a splendid one to beholdDrakan290 is a splendid one to beholdDrakan290 is a splendid one to behold
Merging two assembly files?
I made a few changes to an assembly, and so did some other members of the team. Now, I want to integrate their changes into mine, and visa versa... Is there any way to do that without redoing all the changes either I did or they did, to each others' file?