Hello, Now that we are using darcs for a web project, I would need more doc about resolving conflicts. For exemple, darcs push fails because a file was changed on the server, because of a cache file created or a mysql table change. I just want to ignore it and to have the push overwrite concerned files. is is easily possible ? Thanks, T.North