I discovered this afternoon a long-forgotten stash. I pop-ed it and now I have lots of merge conflicts.
I'm finding it difficult to grasp the order of events. If I have: <<<<<<< Updated upstream Code block A ======= Code block B >>>>>>> Stashed changes Does that means that Code block A are the changes made after the stash, and Code block B are the changes which were uncommitted at the time the stash was made? Thanks Roddie Grant -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
