Hi, Can someone tell me if I did a git pull - - rebase -- autostash what can I do next to keep my local changes before I do a git pull ?
So, the things is there is some changes at my local but at the remote there are also some changes. I'd like to know the correct way to resolve the conflicts before I push up to the branch that I have cloned. Thanks. -- 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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/6e33a88d-5326-4aac-96e9-9ff764eb893dn%40googlegroups.com.
