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(*).
Which would make it unsuitable for integration. So how do I get rid of
multiple heads "on the server" again ? Up to now I took the warning
"would create multiple heads" as a queue, pulled and merged locally and
then pushed.
Kind regards, pl
--
"One SVN to rule them all, One SVN to check out from,
One SVN to commit them all and on the harddisks bind them
In Las Vegas where the server lies."
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
