Re: [git-users] Updating a staged file makes it dissappear

and check the contents of > the index with git diff --cached. That may give you a hint on what’s going > on. > > Gergely > > On Tue, Mar 21, 2017, 05:07 AD S <ad...@radianweb.com.au > > wrote: > >> I made a mistake in the code on a file on a remote repo an

[git-users] Updating a staged file makes it dissappear

I made a mistake in the code on a file on a remote repo and so used `checkout` to bring it into my branch to fix it. Running `git status` immediately after, I see the file is modified and staged. I then make my changes to fix the code and run `git status` again and see 2 'versions' of the same

[git-users] Re: Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

I think I found the problem: it was a change in permissions, not the actual code On Wednesday, March 1, 2017 at 11:14:21 AM UTC+10, AD S wrote: > > I am in the process of merging my branch into a remote repo (that others > contribute to as well). > > I get a merge error o

[git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

I am in the process of merging my branch into a remote repo (that others contribute to as well). I get a merge error on a file I have not touched in my branch. Curious I open the file, expecting to see the merge conflicts highlighted, eg: *<<

Re: [git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

Cheers! Yep, that's the desire. On Wednesday, March 1, 2017 at 10:29:29 AM UTC+10, Philip Oakley wrote: > > don't forget the space between -- and path/to/file.ext > > the command would overwrite your current version with the version from > --their, is that the desire? > > -- You received

[git-users] What's the best course of action when you need a file from another branch that is not yet merged with master?

I am new to git. I'm working on a large project that has many contributors. I've created a .scss file in a branch that has not yet been reviewed and merged in with master. I need that same file in a new branch to add some code to it. I've been told it is not a good idea to create the same

[git-users] When I update a branch from master I don't get the same files as when I create a new branch. Would anyone know why?

When I update my branch from master it pulls down several files, including some sass files. When I compile, however, gulp alerts me that I am missing .scss files. I tested this by creating a new fresh branch and running gulp sass. This time there were no errors and I saw the missing .scss had

[git-users] When updating from master, I get a message on a file that was 'added by us' although this file is its self on master.

When updating from master I get a message added by us: sass/styles.scss However, this file already exists on master. Shouldn't this just be a merge conflict? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from

[git-users] Re: Noob question: How can I inspect a file 'added by them'?

Many thanks all. This is very useful info. -- 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,

[git-users] When checking out master into a branch, how do I deal with files that say they're modified but weren't?

I've updated my branch from master and have gotten a series of merge errors. Normally I would just adjust the code and re-commit, but I am unsure about how to go about the ones in the following situation: # both modified: /js/foundation6.init.js <--this is updated in master. I

[git-users] Re: [Noob] How to update my local branches/repo with remote repo's content?

Found a solution! git merge origin/develop -- 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,

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

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

[git-users] [Noob] How to update my local branches/repo with remote repo's content?

I'm really sorry, I just don't get it - I'm trying my best. I'm going to try explain this without using Git terminology as I think I'm getting that wrong and confusing everyone.

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

and the remote repository have a copy of an identical file. I make alterations to that file and want to replace the version on the remote repo with mine. On Friday, January 27, 2017 at 4:48:27 PM UTC+10, Konstantin Khomoutov wrote: > > On Thu, 26 Jan 2017 16:29:12 -0800 (PST) >

[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] 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?

to add it to your .gitignore file too. > > > > > On Wed, Jan 25, 2017 at 2:19 PM, AD S <ad...@radianweb.com.au > > wrote: > >> So, if I make changes to a .scss file and compile it into a .css file and >> then push the entire project to a remote repo, the

[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?

So, if I make changes to a .scss file and compile it into a .css file and then push the entire project to a remote repo, there are 2 files that have been altered, right? I've noticed, however, that only the .css file appears with merge conflict notices. Would anyone know why this is? Could it

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

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

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

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

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

> It's not normal. Is everyone expending that much time solving git issues? > Or it's just you? > Probably more so me, but I do know others spend a surprising (to me) amount of time on it. I posted the question because I have raised that I have issues with it a few times and no one's really

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

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

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

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

Re: [git-users] Re: Noob question: pushing files to remote repo I get merge errors on files I have not changed. Why is this?

On Monday, January 9, 2017 at 9:04:59 AM UTC+10, Magnus Therning wrote: > > > AD S <ad...@radianweb.com.au > writes: > > > Hi, sorry for the delay in reply. > > > > I'm not sure what you mean sorry. Can you extrapolate? > > Operating systems

Re: [git-users] What is exactly happening when a Github pull request gets 'polluted'?

Thanks! That makes sense. On Thursday, January 5, 2017 at 10:58:43 PM UTC+10, Philip Oakley wrote: > > AD, > As Gergely noted, the Github PRS are branch references. > > It can be note that one can update a PR by force pushing an updated branch > to the website. I use this fo

Re: [git-users] What is exactly happening when a Github pull request gets 'polluted'?

On Thursday, January 5, 2017 at 5:37:30 PM UTC+10, Gergely Polonkai wrote: > > Hello, > > it's a bit unclear what exactly you mean by “polluted”. > What I mean is that I will create a branch on Github for my work, which will later be merged into the main, large project. Sometimes, this

Re: [git-users] Other than gitignore, what could be causing a file to not be pushed to remote repo?

:45 AM UTC+10, Philip Oakley wrote: > > Hi AD > > What commands are you using? > > In particular what what is your default push style. You may not actually > be pushing the branch/commit you expect. There was a change not that long > ago that reduced the number

[git-users] What is exactly happening when a Github pull request gets 'polluted'?

I work in a large team where dozens for branches and commits get created daily. Sometimes (and seemingly at random), the pull-request I create on Github get 'polluted' with other peoples branches and I have to recreate them. What might have 20 commits and 10 files ends up with hundred of other

[git-users] Other than gitignore, what could be causing a file to not be pushed to remote repo?

I was working on updating a couple of .css and a .html file and pushed them to my remote repo. The .css files appear to have transitioned fine, but not the updates to my .html file. I looked in gitignore and saw that there was nothing affecting this .html file. It should push. If I change

[git-users] Re: Noob question: pushing files to remote repo I get merge errors on files I have not changed. Why is this?

I should add that the merge error message I get is 'both modified' even though I promise I have not touched these files (let alone even know of their existence). -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this

Re: [git-users] Git push overwrote remote's files instead of merging. What could have caused this?

Ah thanks! On Monday, December 19, 2016 at 6:19:05 PM UTC+10, Konstantin Khomoutov wrote: > > On Sun, 18 Dec 2016 23:12:36 -0800 (PST) > AD S <ad...@radianweb.com.au > wrote: > > > I pushed some files to my remote server, same as I have always done > > for

[git-users] Git push overwrote remote's files instead of merging. What could have caused this?

I pushed some files to my remote server, same as I have always done for this project. I was expecting to have merge conflicts which I would fix but I got none. I checked the remote server and saw that my adjusted files had completely overwritten the files on that server, meaning that I have now

[git-users] Noob question: Why do my changes disappear when I switch branches? Anyway to stop this?

Hi all, I just wanted to run this past someone as I am having trouble understanding how this works with workflow. I'm working on a large project (currently doing some SASS). I'll get a job to, say, style a particular page. When I'm finished I'll push my changes to Github where they will be

Re: [git-users] Yet more git madness

Ah thank you very much! Legend! On Wednesday, November 2, 2016 at 7:46:19 PM UTC+10, Magnus Therning wrote: > > > AD S <ad...@radianweb.com.au > writes: > > >> > >> > >> > >> I hate to step in here because usually messages like this ar

Re: [git-users] Yet more git madness

> > > > I hate to step in here because usually messages like this are just > exercises in publicly venting frustration, rather than actual requests > for assistance. > > However I don't quite understand what you mean, above. Every single > branch in Git represents a history from the HEAD of

Re: [git-users] Yet more git madness

On Tuesday, November 1, 2016 at 8:59:41 PM UTC+10, Konstantin Khomoutov wrote: > > On Mon, 31 Oct 2016 18:42:14 -0700 (PDT) > AD S <ad...@radianweb.com.au > wrote: > > > Man, I HATE git. > [...] > > Seriously, since using git about 60% of my time is spent

[git-users] Yet more git madness

Man, I HATE git. So I was working on a branch that had a total of 8 files. I needed to make adjustments to 3 of those files. I pulled, made the changes and pushed. Went to check on the branch on Git Hub and all of a sudden everyone else's commits are on my branch. Over 2,800 files and 250+

Re: [git-users] Try as I might, I just don't understand git. Can anyone please help me out?

; > El mar., 25 de oct. de 2016 a la(s) 04:32, Gergely Polonkai < > ger...@polonkai.eu > escribió: > >> >> >> On Tue, Oct 25, 2016, 07:53 AD S <ad...@radianweb.com.au > >> wrote: >> >>> Honestly I must have watched hours of vi

Re: [git-users] Try as I might, I just don't understand git. Can anyone please help me out?

gt; This does still happen when I use 'git status' Sorry if this isnt really enough information. I'm really not sure what's going on. On Tuesday, October 25, 2016 at 5:32:40 PM UTC+10, Gergely Polonkai wrote: > > > > On Tue, Oct 25, 2016, 07:53 AD S <ad...@radianweb.com.au > >

[git-users] Try as I might, I just don't understand git. Can anyone please help me out?

Honestly I must have watched hours of videos and completed 4 or 5 online tutorials and it's still not clicking. I understand the concept: that git is a sub-versioning tool. It makes sense. I know why one would use it. But every time I try to use it something just breaks or goes wrong or blows

[git-users] how to define a GIT repository

Greetings!!! We are implementing the GIT in our project implementation and delivery process. we are facing problem how to define branches for parallel development and optimum point for merging. Let me first brief you all our project and delivery structure as below Could any one suggest me the