[git-users] Developing Wordpress plugins

2010-08-10 Thread Daniel Trezub
for the site-list plugin, so I can develop them separatedly. The problem is: I have no idea how I can keep my main wordpress installation up-to-date with the changes in both plugins, once they are tested and commited. Any ideas, tips, whatever? :) Thanks a lot! = Daniel Trezub http

Re: [git-users] Merging workflow

2010-08-12 Thread Daniel Trezub
Hi, David I have this very same question (but I think you expressed it way better) I am trying to figure it out. If I can discover the answer, I´ll post here. Thanks. = Daniel Trezub http://www.gameblogs.com.br On 12 August 2010 11:22, David Doria daviddo...@gmail.com wrote: Hi all, I

[git-users] Something wrong after simple merge

2011-02-03 Thread Daniel Trezub
, and the good commit is the last commit after the merge. What can I do to find what´s wrong? How can I undo the merge, so I do not loose my two commits? Am I doing something wrong? Thanks for your help! = Daniel Trezub http://www.gameblogs.com.br -- You received this message because you

[git-users] Doubts about Wordpress upgrade using git

2011-02-09 Thread Daniel Trezub
branch will have the same content of the MASTER branch? I don´t quite understant rebase, sorry :S Do I have to delete all files from the UPSTREAM branch or just overwrite them? Thanks for your time and sorry for the long message. = Daniel Trezub http://www.gameblogs.com.br -- You received

[git-users] Setting up a remote repo when the local is already in course

2011-02-11 Thread Daniel Trezub
that, what should I do to upload my changes without risking to kill my live site? I have a branch named 'master' that is supposed to be my release branch. I think I am doing ok with my local repo and git, but the remote part is still a mystery to me. Thanks for your help, pals! = Daniel Trezub http

Re: [git-users] Re: Doubts about Wordpress upgrade using git

2011-02-12 Thread Daniel Trezub
Thanks, Thomas. I'll give a look at all the links you provided. Cheers, = Daniel Trezub http://www.gameblogs.com.br On 12 February 2011 10:32, Thomas Ferris Nicolaisen tfn...@gmail.comwrote: Probably the best thing here is to see how other people do it. I don't know much about Wordpress

Re: [git-users] Re: Setting up a remote repo when the local is already in course

2011-02-13 Thread Daniel Trezub
question is about the remote way of live with git: when I merge/rebase to a remote/origin/master branch, git only updates my local copy of this branch, right? I should use git push to send the changes to the server or it'll do it automatically? Thanks a lot! Daniel Trezub -- You received

Re: [git-users] Re: Setting up a remote repo when the local is already in course

2011-02-14 Thread Daniel Trezub
Ok, thanks. So, even if my remote repo is a brand-new one and my local repo is ages old with a lots of history, after the push the remote repo will have all my history? = Daniel Trezub http://www.gameblogs.com.br On 13 February 2011 23:46, Jeenu gro...@jeenuv.otherinbox.com wrote