result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve the conflict. If you want to see which files are unmerged at any point after a merge conflict, you conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts. Your file contains a section that looks something like this: <<<<<<< HEAD:index in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself. For instance, you might resolve this conflict by replacing the entire

result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve the conflict. If you want to see which files are unmerged at any point after a merge conflict, you conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts. Your file contains a section that looks something like this: <<<<<<< HEAD:index in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself. For instance, you might resolve this conflict by replacing the entire

message). loader (tornado.template.BaseLoader) – the BaseLoader responsible for this template, used to resolve {% include %} and {% extend %} directives. compress_whitespace (bool [https://docs.python.org/3 3: Added whitespace parameter. reset() → None[source] Resets the cache of compiled templates. resolve_path(name: str, parent_path: Optional[str] = None) → str[source] Converts a possibly-relative path methods. When the operation completes, the Awaitable will resolve with the data read (or None for write()). All outstanding Awaitables will resolve with a StreamClosedError when the stream is closed; BaseIOStream

message). loader (tornado.template.BaseLoader) – the BaseLoader responsible for this template, used to resolve {% include %} and {% extend %} directives. compress_whitespace (bool [https://docs.python.org/3 3: Added whitespace parameter. reset() → None[source] Resets the cache of compiled templates. resolve_path(name: str, parent_path: str = None) → str[source] Converts a possibly-relative path to absolute methods. When the operation completes, the Awaitable will resolve with the data read (or None for write()). All outstanding Awaitables will resolve with a StreamClosedError when the stream is closed; BaseIOStream

"userRegistry". sharing of presence information across cluster of servers (see broker relay config options). Resolve user destinations across cluster of servers (see broker relay config options). StompSubProtocolErrorHandler XSD file and exists only in the core of Spring. The following example shows two XML snippets that resolve to the same result: The first uses standard XML format and the second uses the p-namespace. resolve collaborators (other beans) automatically for your bean by inspecting the contents of the ApplicationContext

"userRegistry". sharing of presence information across cluster of servers (see broker relay config options). Resolve user destinations across cluster of servers (see broker relay config options). StompSubProtocolErrorHandler XSD file and exists only in the core of Spring. The following example shows two XML snippets that resolve to the same result: The first uses standard XML format and the second uses the p-namespace. resolve collaborators (other beans) automatically for your bean by inspecting the contents of the ApplicationContext

message). loader (tornado.template.BaseLoader) – the BaseLoader responsible for this template, used to resolve {% include %} and {% extend %} directives. compress_whitespace (bool [https://docs.python.org/3 Changed in version 4.3: Added whitespace parameter. reset() Resets the cache of compiled templates. resolve_path(name, parent_path=None) Converts a possibly-relative path to absolute (used internally). load(name operation completes, the callback will be run or the Future will resolve with the data read (or None for write()). All outstanding Futures will resolve with a StreamClosedError when the stream is closed; users

message). loader (tornado.template.BaseLoader) – the BaseLoader responsible for this template, used to resolve {% include %} and {% extend %} directives. compress_whitespace (bool [https://docs.python.org/3 Changed in version 4.3: Added whitespace parameter. reset() Resets the cache of compiled templates. resolve_path(name, parent_path=None) Converts a possibly-relative path to absolute (used internally). load(name operation completes, the callback will be run or the Future will resolve with the data read (or None for write()). All outstanding Futures will resolve with a StreamClosedError when the stream is closed; users

allow_redirects auth body cert cookies connect_timeout debug decode_content delay expect force_ip_resolve form_params headers http_errors idn_conversion json multipart on_headers on_stats progress proxy "Expect: 100-Continue" workflow must be implemented by Guzzle HTTP handlers used by a client. force_ip_resolve Summary Set to "v4" if you want the HTTP handlers to use only ipv4 protocol or "v6" for ipv6 protocol ions::FORCE_IP_RESOLVE // Force ipv4 protocol $client->request('GET', '/foo', ['force_ip_resolve' => 'v4']); // Force ipv6 protocol $client->request('GET', '/foo', ['force_ip_resolve' => 'v6']); Note

allow_redirects auth body cert cookies connect_timeout debug decode_content delay expect force_ip_resolve form_params headers http_errors idn_conversion json multipart on_headers on_stats progress proxy "Expect: 100-Continue" workflow must be implemented by Guzzle HTTP handlers used by a client. force_ip_resolve Summary Set to "v4" if you want the HTTP handlers to use only ipv4 protocol or "v6" for ipv6 protocol ions::FORCE_IP_RESOLVE // Force ipv4 protocol $client->request('GET', '/foo', ['force_ip_resolve' => 'v4']); // Force ipv6 protocol $client->request('GET', '/foo', ['force_ip_resolve' => 'v6']); Note