<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/tests/resources/rebase-submodule/.gitted, branch ethomson/https_proxy</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/'/>
<entry>
<title>rebase: ignore untracked files in submodules</title>
<updated>2017-03-03T20:07:54+00:00</updated>
<author>
<name>David Turner</name>
<email>dturner@twosigma.com</email>
</author>
<published>2017-03-03T18:27:47+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=2270ca9f8feecf93fe39a02a6fbde90a22c1a665'/>
<id>2270ca9f8feecf93fe39a02a6fbde90a22c1a665</id>
<content type='text'>
An untracked file in a submodule should not prevent a rebase from
starting.  Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.

Signed-off-by: David Turner &lt;dturner@twosigma.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
An untracked file in a submodule should not prevent a rebase from
starting.  Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.

Signed-off-by: David Turner &lt;dturner@twosigma.com&gt;
</pre>
</div>
</content>
</entry>
</feed>
