seth vidal wrote:
On Fri, 2007-08-31 at 08:02 +0200, Tim Lauridsen wrote:
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 <[EMAIL PROTECTED]>
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@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.
thanks! Odd that when it tells me I'm not in sync it suggests I do a
pull.
-sv
_______________________________________________
Yum-devel mailing list
Yum-devel@linux.duke.edu
https://lists.dulug.duke.edu/mailman/listinfo/yum-devel
Yes, git sometime works in mysterious ways :)
Tim
_______________________________________________
Yum-devel mailing list
Yum-devel@linux.duke.edu
https://lists.dulug.duke.edu/mailman/listinfo/yum-devel
