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

> 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

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?

[git-users] What's the correct way of selecting 'ours' or 'theirs' when encountering a merge conflict on push?

I push a file to a remote repo and get a merge conflict error. I know my file is totally correct - there's no need to look through the code, I just want to overwrite the remote file with mine. I've tried: - git merge --strategy-option ours PATH/FILE - git checkout --ours PATH/FILE -

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

Yeah, checkout SASS and/or LESS. You can now make variables with css and make layered and nested classes. A compiler will then 'hard code' the variables, lint the code and remove comments, spaces and line breaks to minify the file. On Thursday, January 26, 2017 at 2:56:05 AM UTC+10, Michael

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

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

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

- 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