Something wrong with my remote repository

All development related issues welcome

Moderator: Moderator Team

Post Reply
zecarlos1957
Posts: 21
Joined: Wed Apr 17, 2019 1:13 am

Something wrong with my remote repository

Post by zecarlos1957 »

It seems that only I have doubts !!!
:roll: , the "Create Pull Request" button has been disabled, and where before it said "can do automatic merge", now says "can not do automatic merge". It happened in my last <git push origin master> where communication with the server was interrupted, and I had to repeat the command. Can anyone help? Do I have to delete the repository and start new one? Thank :roll:

User avatar
katayama_hirofumi_mz
Posts: 54
Joined: Mon Apr 05, 2010 5:43 am
Location: Japan
Contact:

Re: Something wrong with my remote repository

Post by katayama_hirofumi_mz »

Try "git pull" and resolve conflicts.

zecarlos1957
Posts: 21
Joined: Wed Apr 17, 2019 1:13 am

Re: Something wrong with my remote repository

Post by zecarlos1957 »

Good morning, my dear friends.
Yesterday I typed <$ git fetch upstream>. this morning I have a bunch of files ready to commit. These are probably changes made by other contributors. Right?
What message should I write in this commit?

zecarlos1957
Posts: 21
Joined: Wed Apr 17, 2019 1:13 am

Re: Something wrong with my remote repository

Post by zecarlos1957 »

Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING)
$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING)
$ git branch
StartMenu
formating
* master

Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING)
$ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)

Changes to be committed:

modified: base/applications/network/net/cmdUser.c
modified: boot/bootdata/hivesys.inf
modified: dll/cpl/console/console.c
modified: dll/cpl/console/console.h
modified: dll/cpl/console/font.c
modified: dll/cpl/console/layout.c
modified: dll/cpl/console/options.c
modified: dll/cpl/mmsys/volume.c
modified: modules/rostests/apitests/gdi32/TextTransform.c
modified: ntoskrnl/config/cmdata.c
modified: ntoskrnl/ex/sysinfo.c
modified: ntoskrnl/include/internal/ob.h
modified: ntoskrnl/ob/obinit.c
modified: ntoskrnl/ob/obname.c
modified: subsystems/win/basesrv/init.c
modified: win32ss/gdi/ntgdi/freetype.c
modified: win32ss/user/ntuser/display.c
modified: win32ss/user/winsrv/concfg/font.c
modified: win32ss/user/winsrv/concfg/font.h
modified: win32ss/user/winsrv/concfg/precomp.h
modified: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
modified: win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
modified: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c

Unmerged paths:
(use "git add <file>..." to mark resolution)

both added: base/setup/reactos/lang/pt-PT.rc
both added: base/setup/usetup/lang/pt-PT.h
both modified: base/setup/usetup/muilanguages.h
both added: dll/shellext/deskadp/lang/pt-PT.rc
both added: dll/shellext/deskmon/lang/pt-PT.rc
both added: dll/win32/syssetup/lang/pt-PT.rc


Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING)
$ ^C

Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING)
$

zecarlos1957
Posts: 21
Joined: Wed Apr 17, 2019 1:13 am

Re: Something wrong with my remote repository

Post by zecarlos1957 »

I think I understand.
(resolving conflicts)

Post Reply

Who is online

Users browsing this forum: No registered users and 1 guest