Recovery is not Sikamikanico strumming in git

0 like 0 dislike
16 views
How to restore brench, faced with such a situation.

Did brench:
git checkout-b feature-xxx develop

In branch feature-xxx has made multiple changes to the code without making a git commit, switch to develop:
git checkout develop

Git was written that modified the modified files in the develop of feature-xxx. It was not necessary to me, so I did:
git checkout — IZMENENIYA

Checked worked the program before changes in feature-xxx. Returning to feature-xxx(git checkout feature-xxx) found that changes missing.

Two days of work down the drain, or you can check in the changes?
by | 16 views

2 Answers

0 like 0 dislike
Yes, two days down the drain
in such a case it is necessary to use git stash
by
0 like 0 dislike
> Two days of work
And one commit? Do them more often. Anticipating your question and thinking that you made it for loading into the corporate repository, or (God forbid) to SVN: if you want to make one commit after the completion of the branch can merge all changes into one commit.
by

Related questions

0 like 0 dislike
1 answer
0 like 0 dislike
1 answer
asked Jun 11, 2019 by pwnography
0 like 0 dislike
1 answer
0 like 0 dislike
1 answer
asked Jun 4, 2019 by matros97
0 like 0 dislike
1 answer
110,608 questions
257,186 answers
0 comments
28,864 users