I would recommend using tags (tag tutorial) From your master branch since you are done v1.0 add a tag called v1.0. git tag -a v1.0 -m “Tagging release 1.0” This way you can always come back to a specific version at any time by calling git checkout [tag_name] Another common practice is to use branches … Read more
You can force Git to check the whole repository with git fsck. If a Git repository gets corrupted, you should get a new clone from a non-corrupted repository. Under normal operation Git should check parts of the repository as they are read, so it might take longer to notice some corruption, but it will be … Read more
I found the answer originally here. I’m repeating the details for ease of reference. There are three ‘versions’ that can be included in the AssemblyInfo.cs file: [assembly: AssemblyVersion(“1.1.1.1”)] [assembly: AssemblyInformationalVersion(“2.2.2.2”)] [assembly: AssemblyFileVersion(“3.3.3.3”)] AssemblyInformationalVersion defaults to AssemblyFileVersion if it is not specified. Likewise, AssemblyInformationalVersion and AssemblyFileVersion default to AssemblyVersion if both are not specified. In your … Read more
The following commands: git fetch git reset –hard origin/<branch> will discard all local changes. Where as: git pull Which is exactly the same as: git fetch git merge origin/<branch> will attempt to preserve local changes.
Well the solution was pretty simple, hinted by Pat Notz and Bombe. #Make sure we’re on the master branch $ git checkout master # Make a new branch to hold the work I’ve done $ git branch old_master # Save this branch on my remote repo (for backup) $ git checkout old_master $ git push … Read more
Yes, you are right. There is no button for that. in the Diff View(Side-by-Side View) the items in red are in conflict. They can not be automatically merged. You must review the item in conflict and manually resolve it by copying/editing the block of code that is in conflict. After committing to or updating from … Read more
[Edit, April 2017] If you made your original clone with –single-branch, your remote.origin.fetch setting will be the problem. If you used a –depth limit, that too implies –single-branch. Restore the normal remote.origin.fetch value described below and you will get a fuller clone. Normally, just running git fetch should restore your remote-tracking branches. If git fetch … Read more
Try svn status –show-updates The -u (or –show-updates) option to svn status causes svn to contact the repository and show stuff that’s changed in the repository – is that enough for you ? Depending on what you need, you might want the -q or –verbose flag too
Try deleting your .user and .suo files – these are the user options files that VS creates. You get a .user file for each project and a .suo file for your solution. When they get corrupted, odd things happen. Deleting them will make you lose little things like which project is selected as the startup … Read more
Some tips I’ve learned from a similar situation: Have a remote tracking branch for the upstream author’s work. Pull changes from this tracking branch into your master branch every so often. Create a new branch for each of the topics you’re working on. These branches should generally be local only. When you get changes from … Read more