Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

2017-04-05 7:42 GMT+02:00 Michael : > Worktrees, as I understand it, are about letting one repository have two > working directories with two different checkouts. Historically, git was > designed on the assumption that one repository supported one checkout/one > directory

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

2017-04-05 7:34 GMT+02:00 Zero point minus two : > > Sometimes branches are written as "origin/master" and sometimes they are > written as "origin master" I guess that's a bit confusing. > I am wrong about that. "origin/master" would be a reference to a remote branch,

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

On 2017-04-04, at 6:32 PM, bestbrightestandthens...@gmail.com wrote: > I have two directories. The one called bitbucket/source contains the cloned > repository which was set up by another developer and the other one is called > bitbucket/sourcecode which contains the same from my localhost so

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

2017-04-05 4:48 GMT+02:00 : > Can anyone explain this command I saw in an on-line book: > > $ git worktree add -b emergency-fix ../temp master > > What kind of path is ../temp master ? That's not how I would write a path. > Maybe it's missing a slash and

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

2017-04-05 3:32 GMT+02:00 : > I have two directories. The one called bitbucket/source contains the > cloned repository which was set up by another developer and the other one > is called bitbucket/sourcecode which contains the same from my localhost so > some

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

Can anyone explain this command I saw in an on-line book: $ git worktree add -b emergency-fix ../temp master What kind of path is ../temp master ? That's not how I would write a path. Maybe it's missing a slash and really is ../temp/master ? -- You received this message because you are

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

I have two directories. The one called bitbucket/source contains the cloned repository which was set up by another developer and the other one is called bitbucket/sourcecode which contains the same from my localhost so some of the files in there have been modified due to code changes. So now

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

On Tue, 2017-04-04 at 16:12 -0700, bestbrightestandthens...@gmail.com wrote: ok, looks like I did everything correctly except that I switched directories before i did the git checkout -b branch1 command so I will see what happens next -- i guess i need to specify some files for the new branch

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

ok, looks like I did everything correctly except that I switched directories before i did the git checkout -b branch1 command so I will see what happens next -- i guess i need to specify some files for the new branch (as for item 2. I used SSH). On Tuesday, April 4, 2017 at 10:03:42 AM UTC-6,

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

What did you do during these 2 days of learning? Did you start one of the excellent books on Git, such as the Pro Git book referred to earlier: https://git-scm.com/book/en/v2 and go through it step by step? Or did you just randomly read man pages etc. and type commands? I highly recommend the

Re: [git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

On 2017-04-03, at 8:18 PM, bestbrightestandthens...@gmail.com wrote: > The .gitignore file doesn't result in anything being ignored. It's still > looking at these .gif files, not only that buy jquery library files too. I > can't even create a branch since all I get are these needs merge

[git-users] Why does git tell me a gif file needs merge - how would you ever merge a gif file

The .gitignore file doesn't result in anything being ignored. It's still looking at these .gif files, not only that buy jquery library files too. I can't even create a branch since all I get are these needs merge errors. How long is the learning curve on git? My boss says 4 hours but since I've