Hi Junio, On Thu, 13 Nov 2014, Johannes Schindelin wrote:
> Due to that experience, the documentation also states pretty clearly that > `updateInstead` succeeds only in updating the current branch if the > working directory is clean. To clarify why `updateInstead` is stricter than the `merge` scenario: when pushing into a remote repository with attached working directory, we cannot simply clean up merge conflicts or other problems introduced by a merge. Indeed, it is even possible to push without having any option to fix files in the working directory afterwards. Therefore, the `updateInstead` feature really needs to be adamant about the working directory being clean. Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
