I think what you read as “not a correct branch” is actually “not currently
on a branch”, which is perfectly normal during a merge conflict (and my
wild guess is that’s what you mean you were “kicked out of a branch”, too.)
When you bump into a merge conflict, you get in a so-called detached HEAD
state. It sounds gory, but all that happens is your HEAD (generally
speaking, the commit whose snapshot you can see in your working directory)
is detached from your branches. After you resolve the conflict and use git
commit, your HEAD gets reattached to your branch.
On Wed, Oct 26, 2016, 01:10 AD S wrote:
> Hey, thanks for your reply.
>
> I'll try to put up the error from my Stack Overflow questions, but I might
> not be able to remember them all verbatim. My answers in green below.
>
>
>- Got error saying I was on the wrong branch, when I wasn't (this just
>after a `git commit` command on a new branch).
>
>
> Error I got read something like:
> Execution of target "commit" failed for the following reason: You are not
> on the correct branch.
>
>
> "As commits are snapshots of the whole “project” you can not pull changes
> to only a set of files; you will get everything."
>
> The project I am working on has about 30 sites (Drupal sub sites) with
> thousands of files. So you're saying, if I need to work on 1 changed file I
> will have to pull all these others?
>
> What do you mean “kicked out”? As Git does not have access control built
> in, it cannot deny you from accessing a branch. Again, it would be helpful
> to see an error message
>
> This happens after I get a merge error. I fix it, and then go to commit
> again but get the error: "You are not on the correct branch."Using
> git branch reveals I am no longer on my branch. If I try to switch back to
> my branch I get an error saying something like "Please, commit your
> changes or stash them before you can switch branches."
>
> git-merge output will not necessarily show you which files have conflicts
> (although it is possible to parse it by eye). If you need such information,
> use git status.
>
>
>
> 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 wrote:
>
> Honestly I must have watched hours of videos and completed 4 or 5 online
> tutorials and it's still not clicking.
>
>
> Could you show us which ones? The errors
>
>
> I understand the concept: that git is a sub-versioning tool. It makes
> sense. I know why one would use it.
>
>
> Let's just call it Version Control System. subversion is another tool with
> the same purpose.
>
>
> But every time I try to use it something just breaks or goes wrong or
> blows up.
>
> This has happened just this week, for example:
>
>
>- Got error saying I was on the wrong branch, when I wasn't (this just
>after a `git commit` command on a new branch).
>
> git never says you are on a wrong branch. Could you show us the exact
> error message ?
>
>
>- After a being able to commit and push to github all last week, I
>randomly got a 'Connection refused' message (github.com was still up).
>
> There are tons of reasons that can lead to such an error message, most of
> them being related to network issues, not Git.
>
>
>- Went to pull 7 files from a branch but for some reason, this time,
>it pulled hundreds of files from the whole, broader project.
>
> As commits are snapshots of the whole “project”, you can not pull changes
> to only a set of files; you will get everything.
>
>
>- A few times I got kicked out of the branch after a failed commit and
>wouldn't let me return to branch because I had files waiting to be
>committed. Only way was to hard reset.
>
> What do you mean “kicked out”? As Git does not have access control built
> in, it cannot deny you from accessing a branch. Again, it would be helpful
> to see an error message .
>
>
>- Saying there are merge conflict issues, but not showing what files
>there are on.
>
> git-merge output will not necessarily show you which files have conflicts
> (although it is possible to parse it by eye). If you need such information,
> use git status.
>
>
>- Files that were tracked randomly become un-tracked.
>
> That means they were removed from tracking either by you or by someone
> else, e.g. with git-rm
>
> These are a few, but in reality many similar problems happen throughout
> the day which really impacts my productivity. When I started, and studied,
> git I thought it would be pretty straight forward: pull the files you want
> to work on, make changes, push them and if there is a conflict error fix
> it. But it's complexity is beyond me.
>
> So, am I just cursed? What am I missing here?
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
>
> To unsubscribe
