Hi Bjoern, On Monday 03 of August 2009, Bjoern Michaelsen wrote:
> > Oh sure, but you did that locally, and had no conflict. If you had a > > conflict when you did the pull/merge on Linux, manual intervention would > > be needed from you. On the server, I suppose just an admin would be > > allowed to solve that. > > No: "on the server", you dont do any merges - you just create a new > head/lightweight branch. Anyone can pull the heads and merge them > (resolving conflicts) and push back(*). Well, but for this, you'd need to be either able to pull from both the Mercurial repo and the git one, or wait, until the changes from the Mercurial repo appear in the git repo [which would be too long if it was done daily], and then you'd indeed be able to do the merge resolution yourself. Either way, this was completely theoretic, I don't want the setup of 2 servers [one Mercurial, one git, and some kind of synchronization between them]. But maybe at some stage I'll try to use my HackWeek to add the Mercurial clone/pull/push to git ;-) Regards, Kendy --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
