Re: [git-users] Pushing 2 different branches to the same repo, git says the repo has different files each time.

2017-02-21 Thread Magnus Therning
AD S writes: > Sorry, noob here again. To make explaining this simple I will focus on one > file. > > I've got 2 branches: BranchA and BranchB. > > In both Branches I have had to work on the same file, a style.css file. > > I push BranchA.css to the remote repo. That works fine. > > Now, I push

[git-users] Pushing 2 different branches to the same repo, git says the repo has different files each time.

2017-02-20 Thread AD S
Sorry, noob here again. To make explaining this simple I will focus on one file. I've got 2 branches: BranchA and BranchB. In both Branches I have had to work on the same file, a style.css file. I push BranchA.css to the remote repo. That works fine. Now, I push BranchB into the same repo. I'