The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My work

  • My badges

  • Twitter Updates

  • My Flickr Stream

    20140508-Delphi-2007--Project-Options--Cannot-Edit-Application-Title-HelpFile-Icon-Theming

    20140430-Fiddler-Filter-Actions-Button-Run-Filterset-now

    20140424-Windows-7-free-disk-space

    More Photos
  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,329 other followers

Archive for the ‘Source Code Management’ Category

Git: how to resolve merge conflicts | softwarecave

Posted by Jeroen Pluimers on 2014/08/28

Often the git command-line is easier to than merge a combination of changes, moves and deletions using SourceTree.

If you know how to read the git status output, and to act accordingly.

This tells you how: Git: how to resolve merge conflicts | softwarecave.

–jeroen

Posted in Development, DVCS - Distributed Version Control, git, Power User, Source Code Management | Leave a Comment »

For GIT/Mercurial users: SourceTree for Windows 1.6.1 – Now Available! (via: SourceTree Blog)

Posted by Jeroen Pluimers on 2014/08/20

via the SourceTree for Windows 1.6 – Now Available! | SourceTree Blog.

Make sure you download the 1.6.1 version as that is really the latest:

SourceTree 1.6

Enhancements

  • All new file status view
  • Improved diff view
  • New view configurations
  • Cleaner user interface
  • All new welcome wizard

SourceTree 1.6.1

Bugfixes

  • SRCTREEWIN-1902: Fix crash bug when trying to create a new repo from hosted repos screen
  • SRCTREEWIN-1915: Fix a rare crash bug which could happen when closing/re-opening a repository
  • SRCTREEWIN-1894: Staging/unstaging will get ‘stuck’ and not refresh the file list if you turn on ‘always display full console output’ when performing these operations. The refreshing now happens regardless of whether that option is turned on or not.
  • SRCTREEWIN-1897: Fix a crash bug when listing Stash repos from hosted repos list.
  • Confirming removing files now shows the file names in a list so you know which files you’re removing
  • SRCTREEWIN-1909: Can now commit files if committing individually even if they’re at the root and not using staging (so either Mercurial, or no staging mode in Git)

–jeroen

via: SourceTree Release Notes.

 

Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management, SourceTree | Leave a Comment »

GitHub System Status

Posted by Jeroen Pluimers on 2014/08/19

Any site should have a stat system like this: GitHub System Status.

Posted in Development, DVCS - Distributed Version Control, git, Power User, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »

TortoiseSvn – How do I move a file (or folder) from one folder to another (via: Stack Overflow)

Posted by Jeroen Pluimers on 2014/07/31

It is the second – italic – paragraph what I always forget. Thanks Mark Embling!

To move a file or set of files using tortoise, right-click-and-drag the target files to their destination and release the right mouse button. The popup menu will have a ‘SVN move versioned files here’ option.

Note that the destination folder must have already been added to the repository for the ‘SVN move versioned files here’ option to appear.

Yes, it is also in the TortoiseSVN documentation under Deleting, Moving and Renaming and Copying/Moving/Renaming Files and Folders. But those are lacking emphasis on the the italic stuff.

–jeroen

via svn – How do I move a file (or folder) from one folder to another in TortoiseSVN? – Stack Overflow.

Posted in Development, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »

svn – Where does TortoiseSVN save password cached files in Windows 7? (via: Stack Overflow)

Posted by Jeroen Pluimers on 2014/07/09

If you ever had a Windows SVN tool like TortoiseSVN remember your password on Windows, then look under this directory (thanks ee.):

%AppData%\Subversion\auth

Part of the trick is %AppData%, which points to your user profile (which might not be on your C: drive, or not on a drive at all).

Under that directory, is a set directories creating credentials that depend on the authentication method (thans M4N who pointed me to the TortoiseSVN authentication section on the docs): Read the rest of this entry »

Posted in Development, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »

 
Follow

Get every new post delivered to your Inbox.

Join 1,329 other followers

%d bloggers like this: