Re: Workflow on git with 2 branch with specifc code

2014-01-22 Thread Gordon Freeman
On 01/22/2014 12:23 PM, Gordon Freeman wrote: On 01/22/2014 12:16 PM, Gordon Freeman wrote: Oh, sorry if i misunderstand you. My english is not so good. it will be a pleasure if you could explain that. I did some research about topic branchs, and get a lot of useful info of workflows on the

Re: Workflow on git with 2 branch with specifc code

2014-01-18 Thread Gordon Freeman
Hello! Thx you all guys for the help. That's no need more explanations here for rebases Jon. I alredy do a lot of this when i need to change configs of databases and domains and other things, of my local branch to do some tests, so this is ok for me. Seems that i just need some. some people

Workflow on git with 2 branch with specifc code

2014-01-17 Thread Gordon Freeman
Hello guys, im Gordon. I have a question about workflow with git that i dont know if im doing it right. I have 1 repo with 2 branchs the first is the master of the project. the second is a branch copy of the master but he need to have some specifc code because is code for a client. so, every time

Re: Workflow on git with 2 branch with specifc code

2014-01-17 Thread brian m. carlson
On Fri, Jan 17, 2014 at 10:14:28AM -0200, Gordon Freeman wrote: Hello guys, im Gordon. I have a question about workflow with git that i dont know if im doing it right. I have 1 repo with 2 branchs the first is the master of the project. the second is a branch copy of the master but he need

Re: Workflow on git with 2 branch with specifc code

2014-01-17 Thread Jon Seymour
On Sat, Jan 18, 2014 at 10:05 AM, brian m. carlson sand...@crustytoothpaste.net wrote: On Fri, Jan 17, 2014 at 10:14:28AM -0200, Gordon Freeman wrote: Hello guys, im Gordon. I have a question about workflow with git that i dont know if im doing it right. I have 1 repo with 2 branchs the