Automatic Merge svn-git?

137 Views Asked by At

I have a few question. First of all i want to know is git better than subversion? I am using subversion i want to merge trunk to branch automatically , how can i do this? If it’s impossible do i have to use git ? Is merging automatically a good way ? And last question: Which one of these big companies (like google,oracle etc.) use or they use something else and do they merge automatically ?

1

There are 1 best solutions below

1
On

No, Git is not better than Subversion, it's different. Regarding auto-merges, see "Automatic reintegration merge".