[git-users] Re: probably silly...

2009-06-16 Thread Mark Thalman

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 git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~--~~~~--~~--~--~---



[git-users] Re: getting started

2008-09-15 Thread Mark Thalman

I would like to append to Eric's excellent list:

An audio interview with Junio at http://twit.tv/floss19 to get you  
excited about using git.

A good reference script to building git.  This came in handy for  
installing git on Tiger.  All of the nice symbolic links to git-* are  
missing, but git is there and useable.
http://dysinger.net/2007/12/30/installing-git-on-mac-os-x-105-leopard

-- 
Mark

On Sep 15, 2008, at 2:07 AM, Eric wrote:

>
> You'll definitely want to learn about merges *and* all that stuff
> before your proceed too much further. There are a lot of great
> tutorials out there.
>
> If you're on windows, install this: 
> http://msysgit.googlecode.com/files/Git-1.5.6.1-preview20080701.exe
> (Git-Bash only mode is acceptable)
> Say Yes when the installer asks if you'd like to install the Explorer
> extension so you can right click on and folder and say "Git Bash
> Here".
>
> Once you have git, follow the gittutorial:
> http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
>
> Watch this video:
> http://www.youtube.com/watch?v=8dhZ9BXQgc4
> And maybe this one:
> http://www.youtube.com/watch?v=4XpnKHJAok8
>
> Read these:
> http://www.kernel.org/pub/software/scm/git/docs/everyday.html
> http://www.newartisans.com/blog_files/git.from.bottom.up.php
>
> The easiest thing to do is to each develop on your own machine, and
> email a zipped working directory (with .git/ directory) back and
> forth. Unzip her files next to your working directory and pull her
> repository in.
>
> Now, if you just want to share code with your friend, you create a
> public repository. It which will have read access, but not write
> access.
> http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#setting-up-a-public-repository
>
>
> On Sep 12, 11:06 am, "M@" <[EMAIL PROTECTED]> wrote:
>> Sorry, should have been clearer
>> /public_html/me
>> /public_html/her
>>
>> then commit to /public_html.
>>
>> It sounds like what you're saying is for me to set it up in
>> public_html, have her clone it, and the push and pull as we need to
>> with no separate directories.  I was looking at some how_to's and  
>> they
>> were talking about merging and all that stuff.
>>
>> Thanks!
>> M@
>>
>> On Sep 12, 11:01 am, Petr Baudis <[EMAIL PROTECTED]> wrote:
>>
>>>   Hi,
>>
>>> On Fri, Sep 12, 2008 at 07:53:14AM -0700, M@ wrote:
 I have a small project that I am going to be working on using PHP/
 mySQL.  I have a friend who would like to help me work on it.
>>
 We're both on windows machine and she is really unfamiliar with
 command line stuff, but picks things up pretty quickly.  I'm also
 getting into some ruby development and saw Git mentioned  
 everywhere.
 I thought this might be a good opportunity to start getting my feet
 wet with Git.
>>
 I have git installed on my webhost (bluehost.com), and I'd like to
 start utilizing it.  Is there a way for me to develop in tandem  
 with
 my friend?  We're going to be developing different parts of the
 project so there shouldn't be any overlap, but I was hoping on some
 advice for getting started.
>>
 I had thought I might create two directories inside the site, one  
 for
 her, and one for me, and merge our code when it was ready into the
 main site directory.
>>
 Am I going about this all wrong?
>>
>>>   I'm not sure what "two directories inside the site" means, but  
>>> be sure
>>> to both work within the same directory hierarchy within the  
>>> repository
>>> itself.
>>
>>>   Simplest setup: First, import your project to Git and upload  
>>> that to
>>> the site, then let her clone it.  Then, you can both start hacking  
>>> away
>>> and committing stuff, pulling from the site pushing back once in a  
>>> while.
>>> Sometimes, you will get an error that newer changes are at the  
>>> site than
>>> in your local repository - in that case, git pull first - that will
>>> merge the changes of the other person - and then try git push again.
>>
>>>   I recommend you to follow one of the many Git tutorials lying  
>>> around
>>> all over the net.
>>
>>> --
>>> Petr "Pasky" Baudis
>>> The next generation of interesting software will be done
>>> on the Macintosh, not the IBM PC.  -- Bill Gates
> >


--~--~-~--~~~---~--~~
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 git-users@googlegroups.com
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
-~--~~~~--~~--~--~---