Re: [git-users] Git Branching and Merging Strategy for a Shared Team Resource

2019-04-29 Thread Mikko Rantalainen
On Fri, 26 Apr 2019, 04:22 ckdev101, wrote: > > Here is the team make-up: > >- Sprint Team #1 >- Sprint Team #2 >- *Shared* DBA across teams >- Dev. Lead (Myself) > > ... > > The problem is that the shared DBA needs to constantly and consistently > make changes *across* teams for

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-02-07 Thread Hugh Gleaves
> on the master). > > Have you had a case of having to incoprporate incompatible code that you > could share? > Philip > > - Original Message - > > *Subject:* Re: [git-users] Git branching and merge strategy for merge > with lots of conflicts requiring multiple peopl

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-02-07 Thread Philip Oakley
- From: Hugh Gleaves To: Git for human beings Cc: philipoak...@iee.org Sent: Monday, February 06, 2017 7:46 PM Subject: Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people I suspect that you are perceiving "me

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-02-02 Thread Magnus Therning
Michael writes: >> Have you looked at git-imerge? > > Imerge looks like a really nice tool. How stable/sufficient is it? Why > is it not part of the normal git distribution? I've not had any problems with stability, but then I generally try to avoid ending up in situations

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-27 Thread Michael
On 2017-01-27, at 12:57 AM, Philip Oakley wrote: > > It doesn't happen at my work, but one has to ask how / why have we dug the > hole so deep and wide that this gross merge conflict continues to repeat it > self as a regular corporate activity, and then how to get out

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-27 Thread Stephen Morton
On Thursday, 26 January 2017 16:37:16 UTC-5, Magnus Therning wrote: > > > Stephen Morton writes: > > > I'm looking for a git branching and merge strategy for merge with lots > > of conflicts requiring multiple people. I can make it work, and I > > understand git, but it

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-27 Thread Philip Oakley
ting out. > > Philip > > If we don't understand, we won't improve ... > https://store.xkcd.com/products/try-science > > - Original Message - > From: "Michael" <keybou...@gmail.com> > To: <git-users@googlegroups.com> > Sent: Friday,

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-27 Thread Philip Oakley
we don't understand, we won't improve ... https://store.xkcd.com/products/try-science - Original Message - From: "Michael" <keybou...@gmail.com> To: <git-users@googlegroups.com> Sent: Friday, January 27, 2017 12:48 AM Subject: Re: [git-users] Git branchi

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-26 Thread Michael
> Have you looked at git-imerge? Imerge looks like a really nice tool. How stable/sufficient is it? Why is it not part of the normal git distribution? I noticed that it was still getting dev work this month, and in the last two years a bunch of people forked copies of it, and made their own

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-26 Thread Michael
On 2017-01-26, at 1:12 PM, Philip Oakley wrote: > > Is the project well modularised with no file >100 lines (excepting, maybe, > well developed libraries that never change), 100 lines per file?? You're joking, right? That's one of those "in theory" things, right?

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-26 Thread Stephen Morton
On Thursday, 26 January 2017 16:12:43 UTC-5, Philip Oakley wrote: > > - Original Message - > > I'm looking for a git branching and merge strategy for merge with lots of > conflicts requiring multiple people. I can make it work, and I understand > git, but it all seems kind of awkward

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-26 Thread Magnus Therning
Stephen Morton writes: > I'm looking for a git branching and merge strategy for merge with lots > of conflicts requiring multiple people. I can make it work, and I > understand git, but it all seems kind of awkward and it feels like > there must be a better way. > >

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

2017-01-26 Thread Philip Oakley
- Original Message - I'm looking for a git branching and merge strategy for merge with lots of conflicts requiring multiple people. I can make it work, and I understand git, but it all seems kind of awkward and it feels like there must be a better way. I've got a big git merge to

Re: [git-users] git branching

2012-08-29 Thread Konstantin Khomoutov
On Tue, 28 Aug 2012 12:44:19 -0700 (PDT) git newbie technewbi...@gmail.com wrote: For a more complicated development environment where there is a master branch, a devel branch off of master, and feature branches off of devel, how do you create a feature branch so that it's parent is the devel

Re: [git-users] git branching

2012-08-28 Thread Ryan Hodson
Hi there. The parent branch will always be the *current* branch, so all you need to do is: git checkout develop git branch some-feature git checkout some-feature Or, you can use the -b shortcut to save a step: git checkout develop git checkout -b some-feature In either case, some-feature will

Re: [git-users] git branching

2012-08-28 Thread Adam Prescott
On Aug 28, 2012 8:51 PM, Ryan Hodson hodson.r...@gmail.com wrote: Or, you can use the -b shortcut to save a step: git checkout develop git checkout -b some-feature If you're going to use a shortcut, use a shortcut! git checkout -b some-feature develop -- You received this message because

Re: [git-users] git branching

2012-08-28 Thread Ryan Hodson
Lol. Yea, that's a good point. On Aug 28, 2012 3:11 PM, Adam Prescott a...@aprescott.com wrote: On Aug 28, 2012 8:51 PM, Ryan Hodson hodson.r...@gmail.com wrote: Or, you can use the -b shortcut to save a step: git checkout develop git checkout -b some-feature If you're going to use

Re: [git-users] git branching from tags

2012-07-02 Thread PJ Weisberg
On Monday, July 2, 2012, jack sparrow dafs...@gmail.com wrote: From the git repo, i created a new branch1 with the existing tag tag1. i made some changes to a set of files, filea, fileb. If i run git status it shows that the filea and fileb are modified, so far good. Now i created another

Re: [git-users] Git branching does nothing

2011-10-10 Thread Jeremiah Dodds
On Mon, Oct 10, 2011 at 5:48 PM, JP jetp...@yahoo.com wrote: What am I doing wrong? Have I completely misunderstood a very basic concept in Git? I don't remember previous versions of Git acting like this. As far as I know, they did. You have to commit files in the branch for their changes