Well luckily it's only me.... I'm thinking I might just delete all remote repositories and start over.... I upgraded a project from RAils 1.2.6 to 2.3.2 so you can imagine all the fun that I had to do.... luckily this project dies here, and we re-write it to finish the 2.3.2 upgrade cuz it was my first ever rails project and a monkey could write better code :)
Thanks for your help guys. On Jun 16, 2:45 pm, Dan Preston <[email protected]> wrote: > On Tue, Jun 16, 2009 at 11:31 AM, sw0rdfish <[email protected]> wrote: > > > Firstly thank you very much, this seems to make sense... however... > > > my concern is that I then push to a remote server... when I try to > > push master to the remote server, is it going to freak out on me? > > By default it won't allow you to push to the server since it can screw up > other developers. If you are working alone or absolutely know that you > won't screw up other developers with your project then you can do a git push > -f. You will also need to make sure that the receive.denyNonFastForwards > variable is set to false using git config. > > If other developers work on this repository with you then it is not > recommended that you perform a force push because it will rewrite history > and cause other developers big headaches. Be really sure you know what you > are doing if you go this route. Good luck! > > dan > > > > > > > Is there a command I'll have to do to say "shut up and just take > > it"... I realize this kinda defeats the purpose of Git, but at this > > point.. it's going to be the faster solution. > > > Thanks > > > On Jun 16, 2:27 pm, Mark Thalman <[email protected]> wrote: > > > Try: > > > #Move to the correct branch > > > git checkout development > > > > # Delete the master branch by replacing development with master > > > git branch -M development master > > > > Of course, you should try this on a test repo first. > > > > Good Luck. > > > > On Jun 16, 2009, at 2:06 PM, sw0rdfish wrote: > > > > > I'm having a heck of a time finding the answer to what I assume is a > > > > simple question... > > > > > your help is appreciated... > > > > > I have two branches.... master and development... > > > > > I want the development branch to become the master branch.... I went > > > > about changes the wrong way and over a 3 week period made changes to > > > > master, and then mimicked them in development... stupid I know... so I > > > > don't care about a merge, I just want to make the development branch > > > > the master.... > > > > > How would I do this? Thanks in advance! > > > > -mark --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Git for human beings" 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/git-users?hl=en -~----------~----~----~----~------~----~------~--~---
