...
Así nuestra rama de trabajo pasará a llamarse jira-XXX|REBASE 1/2 (según el número de conflictos que detecte)
| Bloque de código |
|---|
~/portalfundeweb (jira-XXX|REBASE 1/2)
$ git rebase --continue
.m2/settings.xml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add |
editamos el fichero y lo añadimos
| Bloque de código |
|---|
~/portalfundeweb (jira-XXX|REBASE 1/2)$ git add .m2/settings.xml
~/portalfundeweb (jira-XXX|REBASE 1/2)$ git rebase --continue
Applying: Añadimos las carpetas para la gestión de maven
Applying: arreglamos el problema con el settings
Using index info to reconstruct a base tree...
M .m2/settings.xml
.git/rebase-apply/patch:30: trailing whitespace.
<pluginRepository> <id>plugins.archiva.atica.umu.es</id>
.git/rebase-apply/patch:31: trailing whitespace.
<name>ATICA - UMU Plugins Repository</name>
.git/rebase-apply/patch:32: trailing whitespace.
<url>https://archiva.um.es/archiva/repository/FundeWeb/</url>
.git/rebase-apply/patch:33: trailing whitespace.
<releases>
.git/rebase-apply/patch:34: 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...
Auto-merging .m2/settings.xml
CONFLICT (content): Merge conflict in .m2/settings.xml
error: Failed to merge in the changes.
Patch failed at 0002 arreglamos el problema con el settings
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".
~/portalfundeweb (jira-XXX|REBASE 2/2) $ |
Donde nos indica que queda otro conflicto por resolver y nos ha cambiado al REBASE 2/2 Podemos repetir la misma operación
| Bloque de código |
|---|
~/portalfundeweb (jira-XXX|REBASE 2/2) $ git rebase --continue
.m2/settings.xml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
~/portalfundeweb (jira-XXX|REBASE 2/2) $ git add .
~/git-pipeline/portalfundeweb (jira-XXX|REBASE 2/2) $ git rebase --continue
Applying: arreglamos el problema con el settings
~/git-pipeline/portalfundeweb (jira-XXX) $ git push origin jira-IDI-132
Counting objects: 8, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 1.02 KiB | 0 bytes/s, done.
Total 8 (delta 4), reused 0 (delta 0)
remote:
remote: To create a merge request for jira-IDI-132, visit:
remote: https://gitlab.um.es/mncs/portalfundeweb/merge_requests/new?merge_request%5Bsource_branch%5D=jira-XXX
remote:
To https://gitlab.um.es/mncs/portalfundeweb.git
aee3109..f09c0f7 jira-XXX -> jira-IDI-XXX |
Uso del fichero .gitignore
...