![]() Isn't that what the dialog in your picture shows? You can look at the diffs and weigh up whether you want to accept the change or not in each file. Simenzhor wrote: or just stop overwriting specific files. ![]() I did manage to update, by reconfiguring the AtmelSTART project, and updating the csproj (plus a few other places if I remember correctly), but honestly I only needed to update a single file. Recently I had to update the HRI for the Timer/Counter peripheral, because it had introduced a lot of new functions (discovered by accident of course, after starting a new project where these were utilized tor testing - then trying to use the same functions in an older project), but I found no apparent way of only updating the relevant files. I use WinMerge to look at the diff, and I'm looking at how I can actually merge the two files in a way that will be accepted by the AtmelSTART reconfiguration from Atmel Studio 7)Īt this point I'm not quite sure how to proceed in order to keep the AtmelSTUDIO configuration working in the future, and also keeping my changes.Ī second question I have is if there is any real possibility to update specific drivers (let's say a driver that I have not altered at all), without going through an AtmelSTART reconfiguration. Is there a proper way to merge changes that I have made to an ASF4 generated file into either:Ī) The actual AtmelSTART project, so it will always accept my version in the future, orī) The current reconfiguration file, so that I can perform a proper merge of two files if both contain changes (let's say I've made changes to a driver, then the driver is updated.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |