Git stash pop- needs merge, unable to refresh index

First, check git status.As the OP mentions, The actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict. That is where git status would mention that file as being “both modified“ Resolution: Commit the conflicted file. Solution: in this case, simply add and commit your local file. You can … Read more

Can I arrange repositories into folders on Github?

Update Dec. 2021: Lists are now available as a public beta Lists level up the starring experience by making it easy to organize and curate your favorite repositories on GitHub. You can create public lists that appear on your stars page at https://github.com/USERNAME?tab=stars. Lists are available to everyone except enterprise managed users. Original answer: On GitHub … Read more

How can I see which Git branches are tracking which remote / upstream branch?

Very much a porcelain command, not good if you want this for scripting: Note that with git 1.8.3, that upstream branch is displayed in blue (see “What is this branch tracking (if anything) in git?“) If you want clean output, see arcresu’s answer – it uses a porcelain command that I don’t believe existed at the time I originally … Read more

How can I unstage my files again after making a local commit?

git reset –soft HEAD~1 should do what you want. After this, you’ll have the first changes in the index (visible with git diff –cached), and your newest changes not staged. git status will then look like this: You can then do git add foo.java and commit both changes at once.

How to permanently remove few commits from remote branch

You git reset –hard your local branch to remove changes from working tree and index, and you git push –force your revised local branch to the remote. (other solution here, involving deleting the remote branch, and re-pushing it) This SO answer illustrates the danger of such a command, especially if people depends on the remote … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)