Taglib git/github usage

[Festus Hagen]

I do not, That would be a no no ... :)

To touch on that a bit ...

When I would rebase:
> git checkout -b yourfeature
** Accomplish some work ... Notice upstream has a cool new feature!

> git stash (or commit)

> git checkout master
> git pull upstream master
> git checkout yourfeature
> git rebase master

Thanks for checking.

Hopefully this one is not double line spaced, Sorry about the last one!


-Enjoy
fh : )_~




----- Original Message -----
From: Mathias Panzenböck <grosser.meister.morti at gmx.net>
To: taglib-devel at kde.org
Cc: 
Sent: Wednesday, November 28, 2012 4:27 PM
Subject: Re: Taglib git/github usage

Do you rebase things that are already pushed to any github repo?


On 11/28/2012 08:25 PM, Festus Hagen wrote:
> Hi all,
>
> Hoping y'all might take a look at my taglib git/github steps and point out the errors of my ways!
> Apparently I'm doing something wrong, things get all wacked and out of sync.
>
> The following is my procedure:
>
> ** Online
>
> ** Start up
>
> * Logon to github and fork a repo.
>
> * Remember the name or better yet write it down as well as:
>
>      Your repo ssh link (git at github.com:FestusHagen/taglib.git)
>
>      The canonical repo https link (https://github.com/taglib/taglib.git)
>
>
> ** Local
>
> ** Clone and add canonical repo (upstream)
>
>> git clone git at github.com:FestusHagen/taglib.git
>
>> git remote add upstream https://github.com/taglib/taglib.git
>
>
> ** Usage
>
> ** Update Local Master (from the Canonical repo (upstream))
>
>> git checkout master
>
>> git pull upstream master
>
>
> ** Update Public master
>
>> git checkout master
>
>> git push
>
>    or
>
>    > git push origin master
>
>
> ** Branches needing rebasing from master
>
>> git checkout BranchNeedingRebasing
>
>> git rebase master
>
>
> ** Prepare for Pull Request
>
>> git checkout -b yourfeature
>
> ** Create and Commit your changes
>
>> git push origin yourfeature
>
>
> ** Logon to Github
>
> ** Web Browse to upstream and do a Pull Request against /yourfeature
>
> ** After the Pull Request has been merged.
>
>> git push origin :yourfeature
>
>> git branch -D yourfeature
>
> Goto 'Update Local Master'
>
>
> Thanks y'all for doing what ya do!
>
> -Enjoy
> fh : )_~
>
> _______________________________________________
> taglib-devel mailing list
> taglib-devel at kde.org
> https://mail.kde.org/mailman/listinfo/taglib-devel
>

_______________________________________________
taglib-devel mailing list
taglib-devel at kde.org
https://mail.kde.org/mailman/listinfo/taglib-devel