Search Results

Search found 4 results on 1 pages for 'mklhmnn'.

Page 1/1 | 1 

• Windows XP: saving large files on network share stalls

  - by mklhmnn

  When I transfer larger files (a few hundred MB) on a network share (either Buffalo LinkStation or other Windows machine) from my Windows XP Pro SP3, it always stalls. Smaller files are no problem, reading from a network share is also no problem. I already had this problem on my notebook and now on my desktop machine, so I assume that it most likely is no driver problem. Does anybody have a clue what could be the problem — or better: the solution?

  Read the article

• VMWare Player: how to avoid always-on-top of other windows

  - by mklhmnn

  This question seems a little bit related, but not fully (I'm not using two monitors nor full-screen mode). I'm running VMWare Player 2.5.4 on Windows XP in normal window mode. Unfortunately, if I switch to other applications, VMWare remains the front-most window. I can avoid it by clicking the other application's title bar or if it pops up a dialog, but how can I avoid VMWare's "always-on-top"-mode completely?

  Read the article

• Git: can't undo local changes (error: path ... is unmerged)

  - by mklhmnn

  I have following working tree state $ git status foo/bar.txt # On branch master # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate to mark resolution) # # deleted by us: foo/bar.txt # no changes added to commit (use "git add" and/or "git commit -a") File foo/bar.txt is there and I want to get it to the "unchanged state" again (similar to 'svn revert'): $ git checkout HEAD foo/bar.txt error: path 'foo/bar.txt' is unmerged $ git reset HEAD foo/bar.txt Unstaged changes after reset: M foo/bar.txt Now it is getting confusing: $ git status foo/bar.txt # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: foo/bar.txt # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: foo/bar.txt # The same file in both sections, new and modified? What should I do? Thanks in advance.

  Read the article

• Git: after preparing a real merge commit, how to create a simple commit?

  - by mklhmnn

  After invoking git merge --no-commit <commit>, performing a commit will result in a merge commit with two (or more) parents. What command to invoke to create a simple commit instead (without having to re-perform the merge command with the --squash option)?

  Read the article

1