[NZLUG] Managing multiple-machine application configs with DVCS

Tom Skunca tomislav.skunca at gmail.com
Thu Jun 6 16:04:59 NZST 2013


On Thursday 06 June 2013 15:07:49 Jim Cheetham wrote:
>  --- snip ---
>
> Anyway, I've got to the stage of not being able to find any clean way to
> manage the inevitable merge conflicts without having some processing. In
> order to have a quick hack, I'm going to do nasty things with symlinks ...
> 
> --- snip ---

For that you can do this -> http://is.gd/Rs5SR1 (stackoverflow) and exclude 
selected files in your branch from merging. That way you can still push changes 
to the repo without getting into conflicts.


More information about the NZLUG mailing list