Question

Issue in SVN merge

I am facing issue in using SVN repository. Kindly help. I have briefly explained about the issue in the excel taking an example from development.

 

Kindly help, how this can be resolved.

 

 

File attachments
Like 0

Like

1 comments

Dear Sriraksha,

Changes will always be overwritten, they cannot be "merged", since different changes can be done to a single object (one developer can rename the field and other developer can delete it). With SVN you can rollback changes or commit new changes, but not merge them.

Best regards,
Angela

Show all comments