Need help with GIT

[Dirk Hohndel]

On Sat, Sep 05, 2015 at 10:33:56AM -0300, Tomaz Canabrava wrote:
> On Sat, Sep 5, 2015 at 10:17 AM, Guido Lerch <guido.lerch at gmail.com> wrote:
> 
> > If shit can happen... it does, I followed your instructions but made a
> > mistake, now my changes to the uemis-download.c
> > are gone ... :-( HELP !
> > Attached the terminal and what I did ... stupid me. I hope I can get my
> > changes back.
> >
> 
> You didn't loose anything, be calm, ahah. There's a long explanation of
> what happened here, if you just wanna get back to your changes, go to the
> last line of the email.
> 
[...]
> 
> since you only did one git stash, you need to do git stash pop just once to
> get your changes back.
> 

Hi Guido

when working in an open source project there are a few fairly simple
rules (and I know that some proprietary software companies have
established similar guidelines):

a) commit early, commit often. Do NOT make changes in your tree for days
and days and then at the very end commit what you have. Anything that has
been committed can easily be retrieved later. And you can rework the
history any way you like. But creating commits for small changes shows the
development and makes it easier to go back and figure out where errors
were made, and if you write good commit messages you can even go back and
follow the train of thought.

b) do NOT rebase. Just because you can rebase doesn't mean you should.
This one some projects are taking more seriously than others (send Linus a
freshly rebased pull request and you will hear fairly clearly what he
thinks about this). Yes, there are cases where this is a good idea and in
certain cases I may even ask someone to do this, but as a general rule it
is much much better to send me the patches that you were working on, based
on the tree that you were working on.

c) most importantly, do send your work out to others early and often. You
will see [RFC PATCH] emails here, where someone has done some work and
wants feedback. Especially when you are new to a project that's always a
good idea, but even when you have worked on this a long time, it's still a
good idea. Heck I send out requests for comments and I have something like 
three thousand commits in Subsurface.

I have asked you to share your work before and I'll ask you again. Please
send me what you have now. I'll be happy to provide feedback, testing, and
to work with you interactively to turn this into useful, correct, small
commits.

Most importantly, get on IRC and ask for help to get the changes back from
git - they should still be there, as Tomaz pointed out.

Thanks

/D