Re: [Rails-devel] Branches - oops...

[Stefan F. <ste...@we...>]

Mike:
git actually is not that difficult to grasp as soon as you realize
that branches are basically dynamic pointers to the most current commit 
(the head) of that branch.

So restoring the branch only requires resetting the pointer to the 
correct commit. (in our case rails_1.7.12_1880). Most likely there is no 
use for rails_1.7.12_1880 anyway, as there is a rails_1.8.x which 
superseded the older branch.

The other thing might be that after resetting the branch, the commit 
might be unreachable in a sense, that it belongs to no history of a 
branch (history starts at the head of the branch and then following the 
linked commits up to the top of the tree). So check which commits you 
intended to push to the repo and make sure that they do not get lost.

Most likely you had a local branch with a wrong tracking (remote) branch.

You can display all your local branches with the corresponding tracking 
branches using git branch -l -vv
(-vv => very verbose)

Potentially you should change your tracking branch to the correct remote.

git branch -u origin/foo

if you have checked out the local branch that should track foo.

You can get a good picture about what happened with the following tool:

gitk --all

If you need more help, try google the question restricted to 
site:stackoverflow.com, which usually has all the answer

Or simply ask ;-)

Stefan


On 03/17/2014 06:24 PM, Michael Alexander wrote:
> No, I do not know how to revert it.  I was going to have to figure that out.
>
> Unfortunately, git is not really my strong suit.
>
>
> On Mon, Mar 17, 2014 at 1:13 PM, Stefan Frey <ste...@we...
> <mailto:ste...@we...>> wrote:
>
>     Mike:
>     OK now I understand. It seems that you at least did an forced update to
>     rails_1.7.12_1880 if something that was already merged with rails2.0.
>
>     Do you already know how to got it reverted? Otherwise I will have a look
>     later tonight or maybe Brett has a good proposal?
>
>     Stefan
>
>
>
>     On 03/17/2014 09:33 AM, Stefan Frey wrote:
>      > I have not realized what happened. Usually it is possible
>      > to get stuff repaired with git.
>      > Stefan
>      >
>      >
>      > On 03/16/2014 05:04 PM, Michael Alexander wrote:
>      >> Guys,
>      >>
>      >>       It looks like I have been putting stuff into the wrong
>     place with
>      >> my preliminary 1862 work.  I'll try to get that straightened out
>     today.
>      >>    My apologies.
>      >>
>      >> Mike
>      >>
>      >>
>      >>
>     ------------------------------------------------------------------------------
>      >> Learn Graph Databases - Download FREE O'Reilly Book
>      >> "Graph Databases" is the definitive new guide to graph databases
>     and their
>      >> applications. Written by three acclaimed leaders in the field,
>      >> this first edition is now available. Download your free book today!
>      >> http://p.sf.net/sfu/13534_NeoTech
>      >>
>      >>
>      >>
>      >> _______________________________________________
>      >> Rails-devel mailing list
>      >> Rai...@li...
>     <mailto:Rai...@li...>
>      >> https://lists.sourceforge.net/lists/listinfo/rails-devel
>      >>
>      >
>      >
>     ------------------------------------------------------------------------------
>      > Learn Graph Databases - Download FREE O'Reilly Book
>      > "Graph Databases" is the definitive new guide to graph databases
>     and their
>      > applications. Written by three acclaimed leaders in the field,
>      > this first edition is now available. Download your free book today!
>      > http://p.sf.net/sfu/13534_NeoTech
>      > _______________________________________________
>      > Rails-devel mailing list
>      > Rai...@li...
>     <mailto:Rai...@li...>
>      > https://lists.sourceforge.net/lists/listinfo/rails-devel
>      >
>
>     ------------------------------------------------------------------------------
>     Learn Graph Databases - Download FREE O'Reilly Book
>     "Graph Databases" is the definitive new guide to graph databases and
>     their
>     applications. Written by three acclaimed leaders in the field,
>     this first edition is now available. Download your free book today!
>     http://p.sf.net/sfu/13534_NeoTech
>     _______________________________________________
>     Rails-devel mailing list
>     Rai...@li...
>     <mailto:Rai...@li...>
>     https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>
>
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/13534_NeoTech
>
>
>
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>