Hi, just found this article explaining how to do exactly what I wanted using
only git:
http://joemaller.com/990/a-web-focused-git-workflow/
It's not Wordpress specific, but helps a lot.
My concern was about the conflict markers git would put into the php and
html files live on the server (theref
Hi folks. just for the register, my problem was that I didn't have a default
mergetool configured. After I installed meld and configured it properly
within git, the conflicts were all solved and the merge was sucessful.
Thanks :)
=
Daniel Trezub
http://www.gameblogs.com.br
On 3 February 201
Hi, guys.
Some other questions:
It depends a bit on what you already have on your live site.
>
Why? My live site is supposed to be the same version from my master branch
in my local repo.
4) Clear out the live server (or move the old contents away or something)
>
But this way I'll have a downt
On Feb 14, 5:15 am, Daniel Trezub wrote:
> It's always good to have your release/master branch to have a linear
>
> > history.
>
> Why? Does it make things easier when pushing to the remote repo?
It's got nothing to do with pushing. It's just that your graph will
look tidy and it'll more readab
