0

I have pulled my code from git. I know that some conflicts may happen. So I did the following commands for git pull.

sudo git pull

...which did a fast-forward.
Then I moved my local changes to buffer using

 sudo git stash

Then I pulled new code from git

sudo git pull

...and got told I was already up-to-date.
Then I merged my new changes with new git code

sudo git stash pop

So now problem is, when I check my files all are those git files I couldn't find my changes that I stashed (my local instance updates not merged with my git code).

SQB
  • 3,926
  • 2
  • 28
  • 49
user3755198
  • 105
  • 1
  • 3
  • 8
  • 4
    You spent time trying to hide text, but 90% of it is still readable. Just so you know. – Jimbo Jul 14 '14 at 12:12
  • 1
    Why are all your `git` commands being run with `sudo`? Also, I don't quite understand the problem. You popped the stash, and you now have your local changes back, it seems? The modified files after your `stash pop` are different from the files updated during your `pull`, so it seems the stashing worked properly? – Craig Otis Jul 14 '14 at 12:12
  • but my layout went wrong – user3755198 Jul 14 '14 at 12:15
  • Your layout went wrong? Can you be more specific? If you `stash pop` after a `pull`, your local changes were applied *on top of* the changes that were applied during the `pull`. So if by "my layout went wrong" you mean your web pages look different, you need to examine the changes made remotely by your co-workers, and remedy things. – Craig Otis Jul 14 '14 at 12:16
  • one more guy committed before me and both of us have some ailgnment problem .Now i can see the same alignment issues in his page. We are working on same files – user3755198 Jul 14 '14 at 12:19
  • Your first `git pull` was a fast forward, so you didn't have any local changes. – Ja͢ck Jul 14 '14 at 12:20
  • @user3755198 Okay, so what happened is clear, then? – Craig Otis Jul 14 '14 at 12:21
  • my alignment was correct but when i puled code from git .my new alignment changes are not these instead i can see the other guys code only – user3755198 Jul 14 '14 at 12:24
  • Where are the screenshots you have attached..?? Also, did you get any conflicts when git stash pop..? if not so, do "git status". check whether all your changes exist or not. – Breen ho Jul 14 '14 at 12:31
  • When you popped your stash it should have applied your local changes. I second @Breenho's suggestion to see what `git status` tells you. According to the output of your `stash pop`, your local changes are still there. – Craig Otis Jul 14 '14 at 12:32

0 Answers0