[git-users] want to retain my change of files, but want updated version of files.

2015-10-29 Thread nmh
I did a 1) git clone 2) git branch -b B1 3) git checkout B1 4) made few changes to file a, b, c,d 5) git commit -a 6) git review.(submitted to gerrit) Got some review commentsfor file b,c i want to make changes to files b,c 1) git checkout B1 2) made changes to b,c 3) git status shows

Re: [git-users] want to retain my change of files, but want updated version of files.

2015-10-29 Thread Konstantin Khomoutov
On Thu, 29 Oct 2015 01:41:23 -0700 (PDT) nmh wrote: > I did a > > 1) git clone > 2) git branch -b B1 > 3) git checkout B1 The steps 2-3 look strange. You either do `git branch B1` followed by `git checkout B1` or just `git checkout -b B1` which combines the former