Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Konstantin Khomoutov]

On Mon, 6 Feb 2017 12:14:54 -0800 (PST)
Hugh Gleaves  wrote:

> I'd like to see a forum is all I mean, the format interaction and
> usability are weak in mailing lists, IRC is ancient and StackOverflow
> is not confined to Git.
> 
> e.g.
> 
> https://forums.asp.net/
> 
> https://social.msdn.microsoft.com/Forums/sqlserver/en-US/home?category=sqlserver
> 
> http://www.linuxforums.org/forum/
> 
> These are just better UIs and more friendly that these other
> character oriented systems - IMHO

That's fine until you have 2-3 forums to participate on.

I'm subscibed to more than a dozen of mailing lists, and _then_ it's
apparent that forums would just not scale to that degree for me --
emails are way simpler to wield then: you get notification of someone's
post right into your inbox and then you just reply to it right away.
No need to log into some (usually crappy, and -- which is worse --
different for different forums) web interface to respond, you just do
that.  All sensible MUAs show you threads you're participating in using
nice tree views with read/unread state of messages.

And as to "accessible" interfaces for asking about Git, just check out
the Git tag at SO [1] -- there are gazillions of idiotic questions
getting asked and answered each day.  I once get bored and answered
there a question titled "How to log first 10 in Git?" -- a question,
an answer to it could be obtained by searching in the `git log` manual
page for some 30 seconds, -- and guess what? it became the most upvoted
answer among all my answers on SO :-)

Your passage about character-oriented systems, I cannot comprehend --
aren't we exchange text messages no matter whether this happens on a
mailing list or a web-based forum?

1. https://stackoverflow.com/questions/tagged/git

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[AD S]

On Tuesday, February 7, 2017 at 8:02:08 AM UTC+10, Hugh Gleaves wrote:
>
> My position here is that I do not think Git does a good job of promoting 
> itself.
>
> It uses terminology that confuses newcomers because things with names like 
> "checkout" don't quite mean what they mean in other systems.
>
> Far too much educational material, books and documentation is command line 
> oriented and this is off-putting for many.
>

I totally agree with this.

I've tried to 'crack' it many times. I can understand the basics absolutely 
fine, but as soon as something out of the ordinary happens I'm completely 
lost. I don't know the correct terminology to Google the solution. If I do 
find something that sounds similar to my situation, then the solution is 
way beyond my level and though I try I stuff it up and make an even bigger 
mess. I've been through so many rabbit holes of endless Googling.

I've been stuck at this level for months now - there seems to be a huge 
leap between knowing the basics to the next level of understanding. It 
feels like the difference in learning a few phrases of another language one 
day then all of a sudden being forced to have in-depth conversations the 
next.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Hugh Gleaves]

My position here is that I do not think Git does a good job of promoting 
itself.

It uses terminology that confuses newcomers because things with names like 
"checkout" don't quite mean what they mean in other systems.

Far too much educational material, books and documentation is command line 
oriented and this is off-putting for many.

I think Git has a nice elegance about it, here's why:


   - The entire repo is present on a developer's machine, all history etc.
   - Branches are trivial to create and use locally.
   - Staging enables one to selectively commit changes and improve how 
   changes are seen by others.
   - Branches really are just named pointers.
   - Stashes are a nice purely local convenience (and they're just commits 
   under the hood).
   - Rebasing is a huge benefit for developers when keeping up to date with 
   other changes.
   - The Github fork model is superb giving each developer a remote backup 
   of their work.



On Monday, February 6, 2017 at 1:47:22 PM UTC-7, theProphet wrote:
>
> I can't verify this, and I'm telling you from gut instinct-- not 
> thorough analysis, but I think the git architecture is just not very 
> tight.  SVN sorta made the first stab at making a CVS clone and it 
> included a tight architecture for atomic writes and a well-established 
> (Apache) web-backend for handling multiple coders using 
> well-established protocols. 
>
> Personally I found a lot of questions with git that makes it 
> untrustworthy for enterprise coding, IMO.  I would get a license for 
> SVN from Tigris, use a conversion tool for transferring your repo, and 
> try that. 
>
> Marxos 
>
>
> On 2/6/17, Hugh Gleaves  wrote: 
> > I'd like to see a forum is all I mean, the format interaction and 
> usability 
> > 
> > are weak in mailing lists, IRC is ancient and StackOverflow is not 
> confined 
> > 
> > to Git. 
> > 
> > e.g. 
> > 
> > https://forums.asp.net/ 
> > 
> > 
> https://social.msdn.microsoft.com/Forums/sqlserver/en-US/home?category=sqlserver
>  
> > 
> > http://www.linuxforums.org/forum/ 
> > 
> > These are just better UIs and more friendly that these other character 
> > oriented systems - IMHO 
> > 
> > 
> > On Monday, February 6, 2017 at 12:26:20 PM UTC-7, Magnus Therning wrote: 
> >> 
> >> 
> >> Hugh Gleaves  writes: 
> >> 
> >> > SmartGit is the best way to begin working with Git, it is much less 
> >> > confusing that the (poorly explained) command line stuff, plenty of 
> >> > time for command line later, most developers here rarely if ever need 
> >> > to use command line. 
> >> 
> >> That may be true for some, but not all. Personally I found the command 
> >> line, augmented with some aliases, *much* easier to grasp than any GUI. 
> >> For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different 
> >> strokes for different folks ;) 
> >> 
> >> > Finally I'm astonished that there is no Git forum out there, Github 
> >> > don't provide one and Git itself is archaic (mailing lists) and 
> >> > Syntervo rely on this Google group, we need a Git forum where 
> everyone 
> >> > and anyone using Git can get answers to questions. 
> >> 
> >> There's this email list, IRC and stack overflow, what other fora do you 
> >> want? 
> >> 
> >> /M 
> >> 
> >> -- 
> >> Magnus Therning  OpenPGP: 0x927912051716CE39 
> >> email: mag...@therning.orgjabber: mag...@therning.org 
> >>  
> >> twitter: magthe   http://therning.org/magnus 
> >> 
> >> The early bird may get the worm, but the second mouse gets the cheese. 
> >> 
> > 
> > -- 
> > You received this message because you are subscribed to the Google 
> Groups 
> > "Git for human beings" group. 
> > To unsubscribe from this group and stop receiving emails from it, send 
> an 
> > email to git-users+...@googlegroups.com . 
> > For more options, visit https://groups.google.com/d/optout. 
> > 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[\0xDynamite]

I can't verify this, and I'm telling you from gut instinct-- not
thorough analysis, but I think the git architecture is just not very
tight.  SVN sorta made the first stab at making a CVS clone and it
included a tight architecture for atomic writes and a well-established
(Apache) web-backend for handling multiple coders using
well-established protocols.

Personally I found a lot of questions with git that makes it
untrustworthy for enterprise coding, IMO.  I would get a license for
SVN from Tigris, use a conversion tool for transferring your repo, and
try that.

Marxos


On 2/6/17, Hugh Gleaves  wrote:
> I'd like to see a forum is all I mean, the format interaction and usability
>
> are weak in mailing lists, IRC is ancient and StackOverflow is not confined
>
> to Git.
>
> e.g.
>
> https://forums.asp.net/
>
> https://social.msdn.microsoft.com/Forums/sqlserver/en-US/home?category=sqlserver
>
> http://www.linuxforums.org/forum/
>
> These are just better UIs and more friendly that these other character
> oriented systems - IMHO
>
>
> On Monday, February 6, 2017 at 12:26:20 PM UTC-7, Magnus Therning wrote:
>>
>>
>> Hugh Gleaves  writes:
>>
>> > SmartGit is the best way to begin working with Git, it is much less
>> > confusing that the (poorly explained) command line stuff, plenty of
>> > time for command line later, most developers here rarely if ever need
>> > to use command line.
>>
>> That may be true for some, but not all. Personally I found the command
>> line, augmented with some aliases, *much* easier to grasp than any GUI.
>> For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different
>> strokes for different folks ;)
>>
>> > Finally I'm astonished that there is no Git forum out there, Github
>> > don't provide one and Git itself is archaic (mailing lists) and
>> > Syntervo rely on this Google group, we need a Git forum where everyone
>> > and anyone using Git can get answers to questions.
>>
>> There's this email list, IRC and stack overflow, what other fora do you
>> want?
>>
>> /M
>>
>> --
>> Magnus Therning  OpenPGP: 0x927912051716CE39
>> email: mag...@therning.orgjabber: mag...@therning.org
>> 
>> twitter: magthe   http://therning.org/magnus
>>
>> The early bird may get the worm, but the second mouse gets the cheese.
>>
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Hugh Gleaves]

I'd like to see a forum is all I mean, the format interaction and usability 
are weak in mailing lists, IRC is ancient and StackOverflow is not confined 
to Git.

e.g.

https://forums.asp.net/

https://social.msdn.microsoft.com/Forums/sqlserver/en-US/home?category=sqlserver

http://www.linuxforums.org/forum/

These are just better UIs and more friendly that these other character 
oriented systems - IMHO


On Monday, February 6, 2017 at 12:26:20 PM UTC-7, Magnus Therning wrote:
>
>
> Hugh Gleaves  writes: 
>
> > SmartGit is the best way to begin working with Git, it is much less 
> > confusing that the (poorly explained) command line stuff, plenty of 
> > time for command line later, most developers here rarely if ever need 
> > to use command line. 
>
> That may be true for some, but not all. Personally I found the command 
> line, augmented with some aliases, *much* easier to grasp than any GUI. 
> For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different 
> strokes for different folks ;) 
>
> > Finally I'm astonished that there is no Git forum out there, Github 
> > don't provide one and Git itself is archaic (mailing lists) and 
> > Syntervo rely on this Google group, we need a Git forum where everyone 
> > and anyone using Git can get answers to questions. 
>
> There's this email list, IRC and stack overflow, what other fora do you 
> want? 
>
> /M 
>
> -- 
> Magnus Therning  OpenPGP: 0x927912051716CE39 
> email: mag...@therning.orgjabber: mag...@therning.org 
>  
> twitter: magthe   http://therning.org/magnus 
>
> The early bird may get the worm, but the second mouse gets the cheese. 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Hugh Gleaves]

That's fine and I have no argument against using the CLI.

However there is no *need* to use the CLI most of the time, you can devise 
and follow a workflow that almost never requires the CLI, many developers 
living in an IDE will appreciate this and be more productive, I can 
honestly say that the CLI clouded my understanding of Git initially and 
this is partly due to the unfriendly way the many commands are documented.

I just think it's not good for Git adoption to compel users to use the CLI, 
this can alienate them and make Git an explicit part of their work rather 
than an implicit, enabling them to focus on their work.



On Monday, February 6, 2017 at 12:33:30 PM UTC-7, John McKown wrote:
>
> On Mon, Feb 6, 2017 at 1:26 PM, Magnus Therning  > wrote:
>
>>
>> Hugh Gleaves  writes:
>>
>> > SmartGit is the best way to begin working with Git, it is much less
>> > confusing that the (poorly explained) command line stuff, plenty of
>> > time for command line later, most developers here rarely if ever need
>> > to use command line.
>>
>> That may be true for some, but not all. Personally I found the command
>> line, augmented with some aliases, *much* easier to grasp than any GUI.
>> For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different
>> strokes for different folks ;)
>>
>
> ​I like to use the CLI as much as possible. Mainly because I like to 
> "script" things. Scripting a GUI is a PITA. GUI are very nice for people 
> who don't really want or need to become an "expert". But doing everything 
> in a GUI tends to (I think) make people "lazy" so that they don't really 
> become interested in the "underpinning". Which may be just fine for most 
> programmers. They need to have a good knowledge of their application domain 
> and the tools & languages to write & debug application code​. Much like I 
> am with a car - I know how to drive & how to put gas into it. I don't even 
> change my own oil. And I don't really care what the embedded computer is 
> doing so long as I get where I want to go.
>
>  
>
>>
>> > Finally I'm astonished that there is no Git forum out there, Github
>> > don't provide one and Git itself is archaic (mailing lists) and
>> > Syntervo rely on this Google group, we need a Git forum where everyone
>> > and anyone using Git can get answers to questions.
>>
>> There's this email list, IRC and stack overflow, what other fora do you
>> want?
>>
>> /M
>>
>> --
>> Magnus Therning  OpenPGP: 0x927912051716CE39
>> email: mag...@therning.orgjabber: mag...@therning.org 
>> 
>> twitter: magthe   http://therning.org/magnus
>>
>> The early bird may get the worm, but the second mouse gets the cheese.
>>
>> --
>> You received this message because you are subscribed to the Google Groups 
>> "Git for human beings" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to git-users+...@googlegroups.com .
>> For more options, visit https://groups.google.com/d/optout.
>>
>
>
>
> -- 
> Our calculus classes are an integral part of your education.
>
> Maranatha! <><
> John McKown
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[John McKown]

On Mon, Feb 6, 2017 at 1:26 PM, Magnus Therning  wrote:

>
> Hugh Gleaves  writes:
>
> > SmartGit is the best way to begin working with Git, it is much less
> > confusing that the (poorly explained) command line stuff, plenty of
> > time for command line later, most developers here rarely if ever need
> > to use command line.
>
> That may be true for some, but not all. Personally I found the command
> line, augmented with some aliases, *much* easier to grasp than any GUI.
> For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different
> strokes for different folks ;)
>

​I like to use the CLI as much as possible. Mainly because I like to
"script" things. Scripting a GUI is a PITA. GUI are very nice for people
who don't really want or need to become an "expert". But doing everything
in a GUI tends to (I think) make people "lazy" so that they don't really
become interested in the "underpinning". Which may be just fine for most
programmers. They need to have a good knowledge of their application domain
and the tools & languages to write & debug application code​. Much like I
am with a car - I know how to drive & how to put gas into it. I don't even
change my own oil. And I don't really care what the embedded computer is
doing so long as I get where I want to go.



>
> > Finally I'm astonished that there is no Git forum out there, Github
> > don't provide one and Git itself is archaic (mailing lists) and
> > Syntervo rely on this Google group, we need a Git forum where everyone
> > and anyone using Git can get answers to questions.
>
> There's this email list, IRC and stack overflow, what other fora do you
> want?
>
> /M
>
> --
> Magnus Therning  OpenPGP: 0x927912051716CE39
> email: mag...@therning.org   jabber: mag...@therning.org
> twitter: magthe   http://therning.org/magnus
>
> The early bird may get the worm, but the second mouse gets the cheese.
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>



-- 
Our calculus classes are an integral part of your education.

Maranatha! <><
John McKown

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Magnus Therning]

Hugh Gleaves  writes:

> SmartGit is the best way to begin working with Git, it is much less
> confusing that the (poorly explained) command line stuff, plenty of
> time for command line later, most developers here rarely if ever need
> to use command line.

That may be true for some, but not all. Personally I found the command
line, augmented with some aliases, *much* easier to grasp than any GUI.
For me it was the same with CVS, SVN, P4, Mercurial, TLA, ... different
strokes for different folks ;)

> Finally I'm astonished that there is no Git forum out there, Github
> don't provide one and Git itself is archaic (mailing lists) and
> Syntervo rely on this Google group, we need a Git forum where everyone
> and anyone using Git can get answers to questions.

There's this email list, IRC and stack overflow, what other fora do you
want?

/M

--
Magnus Therning  OpenPGP: 0x927912051716CE39
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

The early bird may get the worm, but the second mouse gets the cheese.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Hugh Gleaves]

I would argue that all of these complaints are because the user does not 
fully understand what's happening, Git is not intuitive (in the sense it 
does not follow patterns of earlier source control systems). Git is very 
well designed indeed, very good.

See my other reply too where I describe a workflow I've introduced for our 
team (which has onshore and offshore staff).

SmartGit is the best way to begin working with Git, it is much less 
confusing that the (poorly explained) command line stuff, plenty of time 
for command line later, most developers here rarely if ever need to use 
command line.

Take a look at the Attlassian site, they have some great documentation:

https://www.atlassian.com/git/tutorials

Finally I'm astonished that there is no Git forum out there, Github don't 
provide one and Git itself is archaic (mailing lists) and Syntervo rely on 
this Google group, we need a Git forum where everyone and anyone using Git 
can get answers to questions.



On Wednesday, January 11, 2017 at 11:14:18 PM UTC-7, AD S wrote:
>
>
>
> On Thursday, January 12, 2017 at 3:35:05 PM UTC+10, Mattias Vannergård 
> wrote:
>>
>> What kind of "strange issues" do you have to sort out?
>>
>
>  You can see some of them in my posts here. Issues include:
>
>- 'Both modified' errors on files I have never touched.
>- 'Polluted' pull requests on github. This is where I push a branch to 
>github and it ends up also including loads of other peoples work. 
> Sometimes 
>I can solve this by closing the PR and re-opening it, sometimes I have to 
>start a new branch. I've had to manually save a back up of work to my 
> local 
>computer, which I feel kinda defeats some of the purpose behind git.
>- Sometimes when I push to the remote repo, only some of the files 
>appear. However, if I push to Github I can see them all appearing fine.
>
>  
>
>>
>> Do you have a common process for branching and merging?
>>
>
> Yes, we use a simple CLI, inhouse software that is meant to fire several 
> git commands at once so you don't miss any or do them out of order.
>  
>
> And do you have any education for "how to use Git" in your organisation?
>>
>
> No. I've been trying to teach my self with books and tutorials. I believe 
> I have a firm understanding of the core concepts, but I keep getting these 
> strange errors coming from left field. 
>  
>  
>
>> How many repos do you have?
>>
>
> 4, including local
>  
>
>>
>> Do you use submodules or subtrees or neither or both?
>>
>
> Neither. 
>
>
> Thanks! 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Hugh Gleaves]

Don't start forming a negative perception of Git, tempting though this is!

I had Git and Github dumped on me two years ago and had little help from 
coworkers back then, I tried very hard to get a solid grasp of it and it 
took me months, but after all that I can now tell you are using a very 
solid and robust system, almost all issues you'll have stem from wrong 
perceptions or a poor workflow, and this is only natural given how poor the 
materials are for learning Git.

SmartGit is a very good way to learn and work with Git too, so despite 
being confused and bewildered you're using two very solid technologies, I'm 
now novice either, been a develop since late 1970s.

Now take a quick look at a post I made recently to StackOverflow, it 
sumarrizes a Git workflow that I've defined for all developers here to work 
with.

http://stackoverflow.com/questions/14865283/proper-git-workflow-scheme-with-multiple-developers-working-on-same-task/41753291#41753291

Understanding this (and similar) workflows is the best way to then 
understand the lower level details, approaching Git basics without 
understanding the bigger picture will probably be more confusing.

Regarding your picture, you need to understand that a pull-request (until 
its approved (merged)) is a branch level request, that is it's a request to 
move ALL commits on one repo/branch to some other repo/branch.

If at the time you create a pull-request there are five commits in your 
branch then a few days later you push and additional three commits to your 
branch, the pull-request will "see" these additional commits and report 
eight commits in the (still pending) pull-request.

Your picture suggests that after you pushed additional recent commits, 
these (in some way) undid some of the hundreds of changed files in the 
original commits, which may have been intentional?





On Monday, January 16, 2017 at 4:33:52 PM UTC-7, AD S wrote:
>
> Hi all,
>
> I decided to screen shot one of these issues I'm encountering. This is a 
> kind of small one.
>
> I've been styling a site - just .scss files. I pushed to Github at the end 
> of the day and saw I had 400+ files that I had apparently altered and 
> merged to the branch. This isn't true - I'd only worked on a handful of 
> files. I spent a few hours trying to figure out why this was before giving 
> up and continuing with my styling (remembering to also manually save a 
> local copy of the files I was working). When I returned today to look at 
> the branch and try to address the problem again, I see that it is back to 
> normal.
>
> I don't know why the branch suddenly contained a few hundred more files 
> than I was working on our why it now suddenly doesn't. This was a lucky one 
> - it fixed its self.
>
>
> 
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[AD S]

Hi all,

I decided to screen shot one of these issues I'm encountering. This is a 
kind of small one.

I've been styling a site - just .scss files. I pushed to Github at the end 
of the day and saw I had 400+ files that I had apparently altered and 
merged to the branch. This isn't true - I'd only worked on a handful of 
files. I spent a few hours trying to figure out why this was before giving 
up and continuing with my styling (remembering to also manually save a 
local copy of the files I was working). When I returned today to look at 
the branch and try to address the problem again, I see that it is back to 
normal.

I don't know why the branch suddenly contained a few hundred more files 
than I was working on our why it now suddenly doesn't. This was a lucky one 
- it fixed its self.



-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[AD S]

Am I using the Github Web interface?

Apart from checking that my files are up there, no I don't. Some people 
here do use it to peer-review code and leave comments against parts of the 
files, though.




>
> Now, I see that you are using both local repositories and github 
> repositories. Are you also using the github web interface? 
>
> --- 
> Entertaining minecraft videos 
> http://YouTube.com/keybounce 
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[AD S]

On Thursday, January 12, 2017 at 3:35:05 PM UTC+10, Mattias Vannergård 
wrote:
>
> What kind of "strange issues" do you have to sort out?
>

 You can see some of them in my posts here. Issues include:

   - 'Both modified' errors on files I have never touched.
   - 'Polluted' pull requests on github. This is where I push a branch to 
   github and it ends up also including loads of other peoples work. Sometimes 
   I can solve this by closing the PR and re-opening it, sometimes I have to 
   start a new branch. I've had to manually save a back up of work to my local 
   computer, which I feel kinda defeats some of the purpose behind git.
   - Sometimes when I push to the remote repo, only some of the files 
   appear. However, if I push to Github I can see them all appearing fine.

 

>
> Do you have a common process for branching and merging?
>

Yes, we use a simple CLI, inhouse software that is meant to fire several 
git commands at once so you don't miss any or do them out of order.
 

And do you have any education for "how to use Git" in your organisation?
>

No. I've been trying to teach my self with books and tutorials. I believe I 
have a firm understanding of the core concepts, but I keep getting these 
strange errors coming from left field. 
 
 

> How many repos do you have?
>

4, including local
 

>
> Do you use submodules or subtrees or neither or both?
>

Neither. 


Thanks! 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

[Mattias Vannergård]

Git has a somewhat steep learning curve, so I have seen teams having these 
problems (3+ hours a day), when no-one on the team was a "Git champion", 
and they were not willing to actually learn...

What kind of "strange issues" do you have to sort out?

Do you have a common process for branching and merging? And do you have any 
education for "how to use Git" in your organisation?

How many repos do you have?

Do you use submodules or subtrees or neither or both?

BR
/Mattias


Den torsdag 12 januari 2017 kl. 01:35:33 UTC+1 skrev AD S:

> Hi all,
>
> Sorry I really don't mean for this to sound pessimistic or whiny - it 
> really is a genuine question.
>
> I come from a background of solo work where I didn't really use git all 
> that much. Now I work with a very large company and git is a huge part of 
> the workflow.
>
> However, I spend usually around 3hrs a day just trying to sort out strange 
> issues I come up against with git. Everyone else here just seems to think 
> this is par for the course, but it frustrates me a lot.
>
> Is this normal when working with large 100+ organisations?
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.