says: throw away all my staged and unstaged changes, forget everything on my current local branch and make it exactly the same as origin/master. You probably wanted to ask this before you ran the command. The destructive nature is hinted at by using the same words as in “hard reset”.
.gitignore will prevent untracked files from being added (without an add -f) to the set of files tracked by Git, however Git will continue to track any files that are already being tracked. To stop tracking a file you need to remove it from the index. This can be achieved with this command. If you want to … Read more
⚠ Important: If you have any local changes, they will be lost. With or without –hard option, any local commits that haven’t been pushed will be lost.[*] If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run a fetch to update all origin/<branch> refs to latest: Backup your … Read more
A similar alternative is the –strategy-option (short form -X) option, which accepts theirs`. For example: However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours changes the merge to just completely ignore the other side. In some cases, the main problem using -X theirs instead … Read more
You could specify what branch you want to pull: Or you could set it up so that your local master branch tracks github master branch as an upstream: This branch tracking is set up for you automatically when you clone a repository (for the default branch only), but if you add a remote to an … Read more
You cannot push anything that hasn’t been committed yet. The order of operations is: Make your change. git add – this stages your changes for committing git commit – this commits your staged changes locally git push – this pushes your committed changes to a remote If you push without committing, nothing gets pushed. If you commit without … Read more
There is no way to share private repository among non-Github users. You need the Github account and be added as collaborator to the project.
I did a git commit but I have not pushed it to the repository yet. So when I do git status, I get ‘# Your branch is ahead of ‘master’ by 1 commit. So if I want to roll back my top commit, can I just do: given that when I do git log I get: commit eb27bf26dd18c5a34e0e82b929e0d74cfcaab316 Date: Tue … Read more
After updating the SourceTree to it’s latest version I am fighting with this issue. Assume following scenario: There are file A, B and C under the version control and there is just one branch. In my working copy, I make some changes to the file A so it turns into a A’ as well as the file B to B’. Someone else in his working copy makes … Read more
My guess is that you are trying to add folder while you already are in folder. Instead, add everything in the folder, rather than the folder itself: To your other question, adding whole folders is fine, but only relevant when adding sub-folders. Again, you can’t git add the folder that is your repository (my_folder above). The usual way to add everything in … Read more