Re: [git-users] Re: Merge and modification strategy

2012-09-27 Thread Gadget/Steve
On 27/09/2012 9:19 AM, Max Hodges wrote: > nice! I like the word "Dictator" for it. Seems like this is how Linus > Torvalds has the Linux kernel Git setup--allows him take credit for > work delegated to others by managing the commits! AFAIK if you delegate work to others and then let their commints

Re: [git-users] Re: Merge and modification strategy

2012-09-27 Thread Max Hodges
nice! I like the word "Dictator" for it. Seems like this is how Linus Torvalds has the Linux kernel Git setup--allows him take credit for work delegated to others by managing the commits! On Thu, Sep 27, 2012 at 4:51 AM, Gadget/Steve wrote: > On 26/09/2012 8:14 PM, Max Hodges wrote: > > Do you h

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Gadget/Steve
On 26/09/2012 8:14 PM, Max Hodges wrote: > Do you have any information of delegates and Git? I haven't come across that > feature yet. Could be useful to OP. Take a look at http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows specifically the Dictator - Lieutenant workflow. -- You re

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Max Hodges
Do you have any information of delegates and Git? I haven't come across that feature yet. Could be useful to OP. On Thu, Sep 27, 2012 at 3:20 AM, Gadget/Steve wrote: > On 26/09/2012 6:51 PM, Max Hodges wrote: > > Yes I don't disagree: that notion of locking a file makes no sense in > Git. I just

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Gadget/Steve
On 26/09/2012 6:51 PM, Max Hodges wrote: > Yes I don't disagree: that notion of locking a file makes no sense in Git. I > just wanted to emphasis the importance for teams to stay in communication if they want to reduce any annoying conflicts during merging because of this feature. Just like when y

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Max Hodges
Yes I don't disagree: that notion of locking a file makes no sense in Git. I just wanted to emphasis the importance for teams to stay in communication if they want to reduce any annoying conflicts during merging because of this feature. Just like when you're renovating a house, a little communicati

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Konstantin Khomoutov
On Wed, 26 Sep 2012 08:33:43 -0700 (PDT) maxhodges wrote: [...] > The problem you are probably worried about if when two users make > changes to the exact same code; that is, when two developers edit the > same lines of code in the same source file. It's still possible to > merge the files, but G

[git-users] Re: Merge and modification strategy

2012-09-26 Thread maxhodges
Hi Salah, It sounds like your team might be more familiar with something like Visual SourceSafe. In the VSS model, VSS keeps your code, and one person can check-it-out at a time. VSS discourages multiple users from accessing the same file simultaneously. In Git anyone with access to the repos

[git-users] Re: Merge and modification strategy

2012-09-26 Thread maxhodges
Hi Salah, It sounds like your team might be more familiar with something line Visual SourceSafe. In the VSS model, VSS holds keep your code and one person can check it out at a time. The VSS discourages multiple uses from accessing the same file simultaneously. In Git anyone with access to th