On Mon, Nov 2, 2015 at 12:14 PM, Michal Suchanek <[email protected]> wrote:
> Rewriting history in git is your choice. You can use git without > rewriting. And really, a merge becoming "impossible" does not really > depend on rewriting. If you have conflicting changes you just have > conflicting changes. > You should read what I wrote more completely: 1. I cloned a repository. 2. I made no changes to the repository. 3. I pulled changes into my local repository. 4. I was "ahead" of the current head of the repository and I was being told I had unstaged changes to deal with. Someone else rewrote history. Their rewriting of history borked my local copy of a repository that I never modified! Yes, if I have conflicting changes, I have conflicting changes. I made no changes, and yet git was out of sync. In this case, rewriting history was not my choice. It was the choice of someone else and it had a negative impact on me. I was able to fix it be deleting my local repo and recloning, so it wasn't the end of the world, but I have a hard time imagining a scenario where fossil would have allowed something like that to happen. -- Scott Robison
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
