Bram

Git says my branch and origin diverged, how do I not lose two days of work Debug Help

I committed locally, someone else pushed to the same branch, and now prints a message about divergent branches and refuses to do anything. I have two days of commits that are not pushed anywhere. I do not want to type a…