Re: [git-users] Re: Stash merge conflicts

2010-07-19 Thread Roddie Grant
On Jul 18, 8:19 pm, Roddie Grant rod...@myword.co.uk wrote: 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

[git-users] Re: Stash merge conflicts

2010-07-18 Thread Konstantin Khomoutov
On Jul 18, 8:19 pm, Roddie Grant rod...@myword.co.uk wrote: 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