[Yum-devel] Re: [yum-cvs] 2 commits - yum/yumRepo.py

[Tim Lauridsen]

seth vidal wrote:
> Git People:
>
>
> On Fri, 2007-08-31 at 00:48 -0400, Seth Vidal wrote:
>   
>> yum/yumRepo.py |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>>     
>
> okay - this one is me.
>
>   
>> New commits:
>> commit 3401ba6c332e676f838d2e419e59ae3da5085c41
>> Merge: 564fd27... 003ef7e...
>> Author: Seth Vidal <skvidal at fedoraproject.org>
>> Date:   Fri Aug 31 00:44:54 2007 -0400
>>
>>     Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
>>     
>>     * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
>>       * Added extra processTransaction callback event PT_DOWNLOAD_PKGS called with packages to download.
>>
>>     
>
> But this isn't me.
>
> When I'm out of sync with whatever is in the origin and I don't remember
> it - I'll do a git pull, it merges, then I do a git push and it shows
> like I've done a commit from what I've had before - it even reads odd
> like that in the changelog.
>
> Is there something else I should be doing?
>
> -sv
>
>
> _______________________________________________
> Yum-devel mailing list
> Yum-devel at linux.duke.edu
> https://lists.dulug.duke.edu/mailman/listinfo/yum-devel
>   
If you are out of sync with the public git repo, then do this

git fetch
git rebase origin

It will pull the changes and add your local commits on top and the you 
get rid of the

Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum

lines.

Tim


    


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.baseurl.org/pipermail/yum-devel/attachments/20070831/cb63b716/attachment.htm