...
| Bloque de código |
|---|
From https://gitlab.um.es/mncs/portalfundeweb
* branch jira-XXX -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: arreglamos el problema con el settings
Using index info to reconstruct a base tree...
M .m2/settings.xml
.git/rebase-apply/patch:42: trailing whitespace.
<pluginRepository> <id>plugins.archiva.atica.umu.es</id>
.git/rebase-apply/patch:43: trailing whitespace.
<name>ATICA - UMU Plugins Repository</name>
.git/rebase-apply/patch:44: trailing whitespace.
<url>https://archiva.um.es/archiva/repository/FundeWeb/</url>
.git/rebase-apply/patch:45: trailing whitespace.
<releases>
.git/rebase-apply/patch:46: trailing whitespace.
<enabled>true</enabled>
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
Falling back to patching base and 3-way merge... |
Pero puede no ser así y que nos responda algo como
| Bloque de código |
|---|
From https://gitlab.um.es/mncs/portalfundeweb
* branch jira-XXX -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Añadimos las carpetas para la gestión de maven
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:33: trailing whitespace.
.git/rebase-apply/patch:34: trailing whitespace.
.git/rebase-apply/patch:50: trailing whitespace.
.git/rebase-apply/patch:58: trailing whitespace.
warning: 4 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging .m2/settings.xml
CONFLICT (add/add): Merge conflict in .m2/settings.xml
error: Failed to merge in the changes.
Patch failed at 0001 Añadimos las carpetas para la gestión de maven
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort". |
Así nuestra rama de trabajo pasará a llamarse jira-XXX|REBASE 1/2 (según el número de conflictos que detecte)
...