Hi, sorry for the typo - I figure that if I copy the rest of my code over, then the .git folder will readjust as needed - yes, I think this will work for me.
Thanks, Anand On Jun 25, 3:28 pm, Anand Ramanathan <[email protected]> wrote: > Thx > > What she I do with the .git folder? > > Sent from my iPhone > > On Jun 25, 2010, at 1:48 PM, Diego Zamboni <[email protected]> wrote: > > > > > I guess you could create a branch, then replace everything in the > > branch with the contents of the fresh folder. Then you can merge both > > branches. > > > --Diego > > > On Fri, Jun 25, 2010 at 2:31 PM, rcanand <[email protected]> wrote: > >> Hi, > > >> I have a single repository on git where I have been modifying files > >> for a while. Something got messed up in the code on that repository, > >> so I needed to create a fresh folder and start afresh to workaround > >> that issue in the code. > > >> Now I want to merge the code in this fresh working folder into my git > >> repository. If I branch or clone, I am getting the same code that has > >> the issue, and I am unable to track down the flaw there. Is it > >> possible to add this fresh code as a commit on top of the existing git > >> repo? I can perceive that this may be hard to do as git retains > >> changes to files, and there is no information in the fresh folder. > > >> If this doesnt work, what is the best alternative? > > >> Thanks > >> Anand > > >> -- > >> You received this message because you are subscribed to the Google Groups > >> "GitHub" group. > >> To post to this group, send email to [email protected]. > >> To unsubscribe from this group, send email to > >> [email protected]. > >> For more options, visit this group > >> athttp://groups.google.com/group/github?hl=en. > > > -- > > You received this message because you are subscribed to the Google Groups > > "GitHub" group. > > To post to this group, send email to [email protected]. > > To unsubscribe from this group, send email to > > [email protected]. > > For more options, visit this group > > athttp://groups.google.com/group/github?hl=en. -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
