I am a git newbie but have used other SCMs.
I have two branches, master and X. Both have changes, both have been
committed. X has a lot of refactoring changes, master has a few bug fixes I
don't want to lose.
I want to merge X into master. But I'm chicken. What if the merge fails and
leaves
I did a commit and push into master a while back. I stayed in master and
made some changes, which I have committed but not pushed.
I want to store the changes but revert my working code to the code I last
pushed (for some regression testing), without permanently discarding the
new changes.
to recover the modifications, just merge the
content of fallback branch: git merge fallback.
William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br
On Tue, Oct 29, 2013 at 9:07 PM, Eric Fowler eric.fow...@gmail.comwrote:
I did a commit and push into master a while
This should be screamingly easy, in fact, I know I have done this before -
but I forget how.
I do remember that I had a hard time with it before. :-(
I have created a file on my C:\ drive. Let us call it
c:\mydir\helloworld.cmd .
I have a Z: drive mapped with lots of drive space and write
git push origin master
On 4 June 2014 08:49, Eric Fowler eric@gmail.com javascript:
wrote:
This should be screamingly easy, in fact, I know I have done this before
-
but I forget how.
I do remember that I had a hard time with it before. :-(
I have created a file on my C
