Thursday, 27 May 2010

GIT: Rough notes on merge issues

I tried this:

And saw this:

So I did this:

And saw this:

Then I did this again:

And it updated (pulled) successfully.
Then I was able to do this:

Which showed something like this:

As I knew my last changes that were "stashed", this showed me a list of all the changed files currently stashed:

Then I was able to retrieve some changes from one of the stashed files by doing this:

Followed by:

1 comment:

Roney Wilson said...

I finally found a reliable SEO company that can deliver. After dealing seo Cambridge contact and empty promises it was refreshing to deal with the Double Spark team. From start to finish they were professional and transparent while managing expectations. I highly recommend Double Spark to all. Thank you….seo agencies cambridge