![]() ![]() My lack of knowledge about git is partly to blame. Then I pulled later commits from the remote repo. You may want to clone whole repository afresh into another directory. As for why they have appeared - it must be some script (makefile or similar) or your IDE that created them. It did, but oh dear, no way could I un-revert them.Įventually, I did a checkout from an earlier revision, to a new local branch, that I named "master-2". If you have some untracked files, that means they are only local to your computer and they do not exist in git repository on server or on other developers computers. There was a bug in recent commits that I had pulled from the remote repo, so I chose to "revert" them. I found that I really have to commit the whole file. Little arrows enable copying these different bits between the files, or deleting. I edited a file, in SmartGit there are two windows, one showing the earlier committed version, the other showing the actual file, with coloured areas to show the differences. Then I can choose to commit them.Īnyway, the bug. When I edit a file, SmartGit automatically detects that and highlights it as "modified", or if I add a file, it gets highlighted and marked as "untracked". SmartGit really is clever, but I discovered a bug yesterday. As I never used the commandline, beyond a simple "clone", I don't appreciate how better or worse it would be using just the CLI. Hopefully this helps someone.I am still enjoying using SmartGit. I found a bunch of posts covering this topic, but most of them confused me. SmartGit (install guide, license files) vcstool. ![]() Reverting the subdirectory is easier than reverting all the files individually. Say you want to make your working tree contain the changes to get to the state of another commit. And then I drilled down deeper into the repository to find the specific subdirectory I wanted to revert. ![]() Since I'm a Windows user that started with the C drive, drilled down into my project folder, to the repository. If you click this button, you will be asked to commit to the local repository. This way, developers dont have to manually set their own line endings on the repository, and because different repositories can have different line ending styles, global tocrlf is not the best, at least in my opinion. The sixth step is to use SmartGit to commit a file. For a repository setting solution, that can be redistributed to all developers, check out the text attribute in the. You can now return to your smartGit and find the new file by right-clicking it and selecting the Stage submenu. Try Window > Files or (Ctrl-Shift-3), then select a file with changes. ![]() mstrap at 21:38 1 you probably toggled off the Files pane. The path to the directory is your local system path. The fourth step is to set up your smartGit test in your working directory, which should be test4.txt. at 12:47 Are these real changes, or just EOL-related Do you have a filter for the Files table set A screenshot of the UI, including Directories and Files view would be helpful. The value is in the table, to the right of the commit message. Go into the Pull Request, and select commits. However after a bit of hunting and I was able to fix this by running. Git (and SourceTree) do not seem to be able to diff text files added to LFS. You can also get the SHA value from GitHub if you prefer. The reason my file was showing as binary (an dI was getting no diff using git diff or SourceTree) was because the file in question was added as a Git LFS file. I opened up SmartGit, viewed a change log, found out which commit I changed these files, went to the commit before that, clicked 'details' and the SHA value is listed right there. The SHA is the unique identifier for each commit. Source code and license information available at git checkout SHA-Value /c/path/to/repo/root/path/to/subdirectory/with/rejected/changes 1git checkout SHA-Value /c/path/to/repo/root/path/to/subdirectory/with/rejected/changes View plain copy to clipboard print about ColdFISH is developed by Jason Delmore. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |