Found the solution here: http://gitster.livejournal.com/43665.html

    git checkout -m FILE

This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.

I am playing a bit with the new Java 7 IO features. Actually I am trying to retrieve all the XML files in a folder. However this throws an exception when the folder does not exist. How can I check if the folder exists using the new IO? 

	public UpdateHandler(String release) {
		log.info(&quot;searching for configuration files in folder &quot; + release);
		Path releaseFolder = Paths.get(release);
		try(DirectoryStream&lt;Path&gt; stream = Files.newDirectoryStream(releaseFolder, &quot;*.xml&quot;)){
		
			for (Path entry: stream){
				log.info(&quot;working on file &quot; + entry.getFileName());
			}
		}
		catch (IOException e){
			log.error(&quot;error while retrieving update configuration files &quot; + e.getMessage());
		}
	}


How to check if a folder exists?

&gt; **Possible duplicate:**  
&gt; [where we use object operator “-&amp;gt;” in php](https://stackoverflow.com/questions/3037526/where-we-use-object-operator-in-php)  
&gt; [Reference - What does this symbol mean in PHP?](https://stackoverflow.com/questions/3737139/reference-what-does-this-symbol-mean-in-php)  

&lt;!-- End of automatically inserted text --&gt;

I see these in PHP all the time but I don&#39;t have a clue as to what they actually mean. What does `-&gt;` do and what does `=&gt;` do. And I&#39;m not talking about the operators. They&#39;re something else, but nobody seems to know...

What does this mean in PHP: -&gt; or =&gt;

In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using `git add FILE` after some editing)

Now I&#39;d like to undo my conflict resolution attempt and start over resolving that file.

How can I do that?

Restart/undo conflict resolution in a single file

In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using <code>git add FILE</code> after some editing)
Now I'd like to undo my conflict resolution attempt and start over resolving that file.
How can I do that?

I&#39;m trying to rebase &#39;dev&#39; to catch up to &#39;master&#39; branch. 

    $ git checkout dev 
    $ git rebase master 
    First, rewinding head to replay your work on top of it...
    Applying: Corrected compilation problems that came from conversion from SVN.
    Using index info to reconstruct a base tree...
    M       src/com/....
    &lt;stdin&gt;:125: trailing whitespace.
    /**
    &lt;stdin&gt;:126: trailing whitespace.
     *
    &lt;stdin&gt;:127: trailing whitespace.
     */
    &lt;stdin&gt;:128: trailing whitespace.
    package com....
    &lt;stdin&gt;:129: trailing whitespace.
    
    warning: squelched 117 whitespace errors
    warning: 122 lines add whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging src/com/....
    CONFLICT (content): Merge conflict in src/com/...
    Failed to merge in the changes.
    Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.
    
    $ vi src/com/.....   { fixed the merge issue on one file } 
    $ git add -A . 
    $ git rebase --continue 
    src/com/....: needs merge
    You must edit all merge conflicts and then
    mark them as resolved using git add
    $ vi src/com....      { verified, no &gt;&gt;&gt; or &lt;&lt;&lt; left, no merge markers } 
    $ git rebase --continue 
    Applying: Corrected compilation problems that came from conversion from SVN.
    No changes - did you forget to use &#39;git add&#39;?
    If there is nothing left to stage, chances are that something else
    already introduced the same changes; you might want to skip this patch.
    
    When you have resolved this problem run &quot;git rebase --continue&quot;.
    If you would prefer to skip this patch, instead run &quot;git rebase --skip&quot;.
    To check out the original branch and stop rebasing run &quot;git rebase --abort&quot;.

Any ideas?

Git rebase merge conflict cannot continue

# Background

Using Git 1.8.1.1 on Linux. The repository looks as follows:

    master
      book

The submodule was created as follows:

    $ cd /path/to/master
    $ git submodule add https://user@bitbucket.org/user/repo.git book

The `book` submodule is clean:

    $ cd /path/to/master/book/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Problem

The master, on the other hand, shows there are &quot;new commits&quot; for the book submodule:

    $ cd /path/to/master/
    $ git status
    # On branch master
    # Changes not staged for commit:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   book (new commits)
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

Git should ignore the submodule directory completely, so that the master is also clean:

    $ cd /path/to/master/
    $ git status
    # On branch master
    nothing to commit, working directory clean

# Failed Attempt #1 - dirty

Inside the file `master/.gitmodules` is the following, as per this [answer][1]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = dirty

# Failed Attempt #2 - untracked

Changed `master/.gitmodules` to the following, as per this [answer][2]:

    [submodule &quot;book&quot;]
            path = book
            url = https://user@bitbucket.org/user/repo.git
            ignore = untracked

# Failed Attempt #3 - showUntrackedFiles

Edited `master/.git/config` to the following, as per this [answer][3]:

    [status]
       showUntrackedFiles = no

# Failed Attempt #4 - ignore

Added the book directory to the master ignore file:

    $ cd /path/to/master/
    $ echo book &gt; .gitignore

# Failed Attempt #5 - clone

Added the book directory to the master as follows:

    $ cd /path/to/master/
    $ rm -rf book
    $ git clone https://user@bitbucket.org/user/repo.git book

# Question

How can the `book` submodule be in its own repository directory under the `master` repository yet have git ignore the `book` submodule? That is, the following should not display:

    #
    #       modified:   book (new commits)
    #

How to suppress that message when executing `git status` in the master repository?

An article about [git submodule pitfalls][4] suggests this an inappropriate submodule usage?


  [1]: https://stackoverflow.com/a/5542452/59087
  [2]: https://stackoverflow.com/a/5127213/59087
  [3]: https://stackoverflow.com/a/4345788/59087
  [4]: http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/


Ignore new commits for git submodule

I can not commit a change:

    $ git commit
    error: invalid object 100644 13da9eeff5a9150cf2135aaed4d2e337f97b8114 for &#39;spec/routing/splits_routing_spec.rb&#39;
    error: Error building trees

I tried so far:

    $ git fsck | grep 13da
    missing blob 13da9eeff5a9150cf2135aaed4d2e337f97b8114

and also:

    $ git prune
    error: Could not read 1394dce6fd1ad15a70b2f2623509082007dc5b6c
    fatal: bad tree object 1394dce6fd1ad15a70b2f2623509082007dc5b6c

and also:

    $ git fsck | grep 13da
    missing blob 13da9eeff5a9150cf2135aaed4d2e337f97b8114

but nothing helped. Should I delete the file, commit and reintroduce back? I am willing to lose little bit of history if it brings git commit back.

git commit stopped working - Error building trees

Let&#39;s imagine that we have a `master` branch.

Then we create a `newbranch`

    git checkout -b newbranch

and make two new commits to `newbranch`: *commit1* and *commit2*

Then we switch to master and make `cherry-pick`

    git checkout master
    git cherry-pick hash_of_commit1

Looking into `gitk` we see that *commit1* and its cherry-picked version have different hashes, so technically they are two different commits.

Finally we merge `newbranch` into `master`:

    git merge newbranch

and see that these two commits with different hashes were merged without problems although they imply that the same changes should be applied twice, so one of them should fail.

Does git really do a smart analysis of commit&#39;s content while merging and decide that changes shouldn&#39;t be applied twice or these commits are marked internally as linked together?

How does git merge after cherry-pick work?

I&#39;d like the command `git co` to be the same as typing `git checkout`.

A normal Bash alias (`alias co=&#39;checkout&#39;`) doesn&#39;t work.


How to alias &#39;git checkout&#39; to &#39;git co&#39;

I&#39;ve read from various sources that it&#39;s usually a better idea to fetch *then* merge rather than simply pull as it allows for finer control.  That said, I&#39;ve yet to find actually how to do it.  Case in point:

There was a small change made to some of the code in one of my GitHub repository&#39;s master branch.  I was able to fetch it, but I don&#39;t know how to actually merge the differences in with *my* local master branch.  `git branch` lists all of the local branches I have, but nothing indicating anything to merge to.

So, is it just something like `git merge master` or `git merge origin/master`?  What am I missing?

Git merge after fetch - how, exactly?

I have a master branch and a working `branch_1`. I want to &#39;move&#39; `branch_1` exactly as it is to `master`. So I want something like this:

    git checkout master
    git merge branch_1 # I don&#39;t know what is correct...


Things which I did but I got loads of files messed up with annoying conflicts. So now master contains exactly the same files of `branch_1` avoiding any conflicts, just overwriting files.
Any help?

Git merge branch into master

I&#39;m thinking if there is a way that when I merge a branch into another branch that ALL changed files are listed in my commit message and not just the ones which were modified in both branches.
This would give me a better overview of what was changed in the branch just by seeing the merge commit.
Is there a way to do this?

List all modified files in git merge commit - even the fast forwarded

I just merged a branch into my master in git and I got `Automatic merge failed; fix conflicts and then commit the result.` Now I ran `git mergetool` and vimdiff opened with the image below. I don&#39;t know how to use vimdiff. What does each panel here mean and how should I proceed to fix the merge conflict?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/kxn1g.png

Content Type	Original Author	Original Content on Stackoverflow
Question	Alex Krauss	View Question on Stackoverflow
Solution 1 - Git	Alex Krauss	View Answer on Stackoverflow

Restart/undo conflict resolution in a single file

Git Problem Overview

Git Solutions

Solution 1 - Git

What does this mean in PHP: -> or =>

How to check if a folder exists?

Attributions