Il 28/06/2011 15.19, eugene ha scritto: Hi, I'm new to GIT and have two questions about code refactoring. #1. I want to refactor class A into few classes B,C,D. How should I check them in and mark class A inactive so that development on A stops? You can't. If you are working on a shared repository you have to modify the code in your private repository (or working directory), then verify if in the mean time another developer changed something, eventually apply other modification to your code (merge) and solve conflicts manually (if there are) in your working directory/private repository. After this you can push your code to the shared repository. Note, I do need A stay in repository for backward compt. with prior code releases. #2. [related question] What if another developer already had A in his local repository, made changes and wants to commit after me. I just made A obsolete. Does he have drop his changes and take B,C,D from me and/or merge? Same as for #1. The last developer that modifies module A has to update other modifications BEFORE and then apply her modifications. Shortly: git doesn't block anything unstead git permits to merge changes coming from more the one developer. It is my opinion that 2 developers haven't to work on the same module at the same time, but this for me is an organization matter it isn't related to git. Sorry if this question was already answered, pls point me. Thanks, Eugene
begin:vcard fn:Massimo Manca n:Manca;Massimo org:Micron Engineering di Massimo Manca adr:;;via della Ferriera, 48;Pordenone;PN;33170;ITALIA email;internet:massimo.manca@xxxxxxxxxxxxxxxxxxxx tel;work:+39 0434 1856131 tel;fax:+39 0434 1851032 / 178 273 3543 tel;cell:+39 349 4504979 url:http://www.micronengineering.it version:2.1 end:vcard