Re: [Cs-dev] Git Branching Strategy
| Date | 2013-07-14 17:07 |
| From | john ffitch |
| Subject | Re: [Cs-dev] Git Branching Strategy |
> Maybe it's because there's more people working simultaneously on the > same sections of code? No; usually happens on unrelated code ==John ffitch ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net |
| Date | 2013-07-14 17:10 |
| From | Justin Smith |
| Subject | Re: [Cs-dev] Git Branching Strategy |
| Attachments | None None |
If two people changed the same line, there are few systems that would actually do the right thing automatically. Someone has to resolve the overlapping changes. Between previewing changes before you merge and communicating with others that change the same file it isn't that hard in my experience. There is also checking out a prior state and redoing the merge, or doing the merge on a new temporary branch, and only bringing in the changes to a working branch once you have a reasonable state. I don't even know how git would mess up a merge with no overlapping changes without pilot error of some sort. On Sun, Jul 14, 2013 at 9:07 AM, john ffitch <jpff@codemist.co.uk> wrote:
|