The only way that I remember right now to overwrite changes (history) in a
"push" is with the -f option, if you havent used that option in "push" then
maybe you are misunderstanding something.
You were the only one working on that repo?
Why did you expect merge conflicts?
When you say "remote server", you're talking about a remote repository?
El lun., 19 de dic. de 2016 a la(s) 04:12, AD S <a...@radianweb.com.au>
escribió:
> I pushed some files to my remote server, same as I have always done for
> this project. I was expecting to have merge conflicts which I would fix but
> I got none. I checked the remote server and saw that my adjusted files had
> completely overwritten the files on that server, meaning that I have now
> lost heaps of work from other branches.
>
> Would anyone know what might have caused this?
>
> My steps were:
>
>
> 1. git add .
> 2. git commit
> 3. git push ${project} ${refspec}
> 4. git merge ${refspec}
> 5. git push ${project} ${server}
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
