Yes you can! http://docs.nuget.org/docs/workflows/using-nuget-without-committing-packages The current NuGet workflow has always been to commit the Packages folder into source control. The reasoning is that it matches what developers typically do when they don’t have NuGet: they create a ‘Lib’ or ‘ExternalDependencies’ folder, dump binaries into there and commit them to source control to allow others to … Read more
I want to be able to perform this diff before merging, including on files without merge conflicts. You just have to set up the index as you like, you never have to commit results. The way to set up for exactly what was asked, straight diffs-since-base with no merge prep, is git merge -s ours … Read more
This article advises to instead of merging two branches, you would rebase them where git would only rebase non duplicate commits. But instead of cherry-picking, you might consider just rebasing the branch: rebase –onto release B bug where release is the release branch and bug is the bug branch. You then get something like C’—D’ … Read more
You have to either set requireForce to false in your .gitconfig or use the -f or -i flag with this command. git clean -f will force to clean the untracked files even if clean.requireForce is set to true which is default. git clean -i will give you an interactive way for cleaning each file git … Read more
I’m coming late to the party but I got a little scared after thinking I lost this morning’s work due to an IntelliJ Smart Checkout. So I looked to see if there was a fix and this question came up first. Sadly, my git stash list was empty (probably because I tried merging the conflicting … Read more
One config setting that might help here is core.sharedRepository, presented in the blog post “Preserving Group Write on Git Objects in a Collaborative Repository”: The solution turned out to be fairly straightforward. In the file .git/config, I added a line that read: “sharedRepository = group“, like so: [core] repositoryformatversion = 0 filemode = true bare … Read more
Git branches do not have “heads” in the Mercurial sense. There is only one thing called HEAD, and it’s effectively a symlink to the commit you currently have checked out. In the case of hosted repositories like GitHub, there is no commit checked out—there’s just the repository history itself. (Called a “bare” repo.) The reason … Read more
Do you have to be the repo owner? Yes you do. How to set the default branch on github.com when I go to browse commits. If you fork the repository, you can change the default branch of your fork, by clicking on the Settings button (see below). This will allow you to pick your favorite … Read more
There is no such feature for VS code. But you can install some git extensions to view and resolve conflict files easily. Such as you can install the extension Git Lens, and when you open conflict files -> click Toggle File Blame, there will shows which lines were you committed and which lines are new … Read more
If your git repo is self hosted, check the file system rights on the remote git directory. If this gets corrupted, it is possible that your git server just doesn’t have rights. For instance, I host my own gitosis system on Ubuntu server. When I create the git repo on the server, I run sudo … Read more