为什么git警告我我的分支已经偏离了主分支？
我正在为LibreOffice做贡献，并开始学习git。我已经克隆了LibreOffice存储库并获得了成功的构建。LibreOffice有19个git存储库，1个命名为bootstrap，其余一个级别较低，命名为writer、calc、postprocess、base等。它有一个脚本maned为什么git警告我我的分支已经偏离了主分支？,git,libreoffice,Git,Libreoffice,我正在为LibreOffice做贡献，并开始学习git。我已经克隆了LibreOffice存储库并获得了成功的构建。LibreOffice有19个git存储库，1个命名为bootstrap，其余一个级别较低，命名为writer、calc、postprocess、base等。它有一个脚本manedg，用于在所有存储库中同时运行git命令，而不是单独运行 克隆之后，我创建了一个补丁，该补丁被推送到远程存储库中。此时，我的所有更改都已提交（即，git diffoutputs nothing），状态是我
ggit diff/g pull-rvictor@victor-laptop:~/git/libo$ ./g pull -r
===== main repo =====
Current branch master is up to date.
===== artwork =====
Current branch master is up to date.
===== base =====
Current branch master is up to date.
===== calc =====
Current branch master is up to date.
===== components =====
Current branch master is up to date.
===== extensions =====
Current branch master is up to date.
===== extras =====
Current branch master is up to date.
===== filters =====
Current branch master is up to date.
===== help =====
Current branch master is up to date.
===== impress =====
Current branch master is up to date.
===== libs-core =====
Current branch master is up to date.
===== libs-extern =====
Current branch master is up to date.
===== libs-extern-sys =====
Current branch master is up to date.
===== libs-gui =====
From http://anongit.freedesktop.org/git/libreoffice/libs-gui
08137a2..d314277 master -> origin/master
First, rewinding head to replay your work on top of it...
Fast-forwarded master to d3142771895c2e9ce029e3b52af7f1ea1b437a6b.
===== postprocess =====
Current branch master is up to date.
===== sdk =====
Current branch master is up to date.
===== testing =====
Current branch master is up to date.
===== ure =====
Current branch master is up to date.
===== writer =====
U sw/source/core/doc/docdesc.cxx
U sw/source/core/frmedt/fews.cxx
M sw/source/core/inc/SwXMLBlockExport.hxx
U sw/source/core/inc/UndoCore.hxx
U sw/source/core/inc/ascharanchoredobjectposition.hxx
U sw/source/core/inc/frame.hxx
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
git statusvictor@victor-laptop:~/git/libo$ cd sw
victor@victor-laptop:~/git/libo/sw$ git diff
diff --cc sw/source/core/doc/docdesc.cxx
index 0900b18,52b984e..0000000
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@@ -216,7 -216,7 +216,11 @@@ void SwDoc::ChgPageDesc( sal_uInt16 i,
if( rChged.GetNumType().GetNumberingType() != pDesc->GetNumType().GetNumbe
{
pDesc->SetNumType( rChged.GetNumType() );
++<<<<<<< HEAD
+ // den Seitennummernfeldern bescheid sagen,
++=======
+ // Bug 64121 - den Seitennummernfeldern bescheid sagen,
++>>>>>>> Removal of bogus comments in writer module
// das sich das Num-Format geaendert hat
GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
diff --cc sw/source/core/frmedt/fews.cxx
index 6fe4bf0,4dc82ff..0000000
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@@ -1266,6 -1267,7 +1266,10 @@@ Size SwFEShell::GetGraphicDefaultSize(
return aRet;
}
++<<<<<<< HEAD
++=======
+ // add output parameter <bVertL2R>
++>>>>>>> Removal of bogus comments in writer module
sal_Bool SwFEShell::IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRTL,
{
sal_Bool bVert = sal_False;
diff --cc sw/source/core/inc/UndoCore.hxx
index e8fda05,99f4722..0000000
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@@ -133,6 -133,7 +133,10 @@@ class SwUndoFmtColl : public SwUndo, pr
void DoSetFmtColl(SwDoc & rDoc, SwPaM & rPaM);
public:
++<<<<<<< HEAD
++=======
+ // SwUndoFmtColl( const SwPaM&, SwFmtColl* );
++>>>>>>> Removal of bogus comments in writer module
SwUndoFmtColl( const SwPaM&, SwFmtColl*,
const bool bReset,
const bool bResetListAttrs );
@@@ -202,6 -203,7 +206,10 @@@ public
virtual void RepeatImpl( ::sw::RepeatContext & );
};
++<<<<<<< HEAD
++=======
+ //--------------------------------------------------------------------
++>>>>>>> Removal of bogus comments in writer module
const int nUndoStringLength = 20;
diff --cc sw/source/core/inc/ascharanchoredobjectposition.hxx
index 16dde41,2f868a9..0000000
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@@ -140,7 -140,7 +140,11 @@@ namespace objectpositionin
Point GetAnchorPos() const;
// calculated relative position to base line for object position ty
++<<<<<<< HEAD
+
++=======
+
++>>>>>>> Removal of bogus comments in writer module
SwTwips GetRelPosY() const;
// determined object rectangle including spacing for object position
diff --cc sw/source/core/inc/frame.hxx
index 664f28b,94db9cc..0000000
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@@ -248,6 -250,9 +248,12 @@@ enum MakePageTyp
MAKEPAGE_NOSECTION // Don't create section frames
};
++<<<<<<< HEAD
++=======
+ // #i28701# - replaced by new class <SwSortedObjs>
+ //typedef SdrObject* SdrObjectPtr;
+ //SV_DECL_PTRARR(SwDrawObjs,SdrObjectPtr,1,1);
++>>>>>>> Removal of bogus comments in writer module
class SwFrm: public SwClient, public SfxBroadcaster
{
(END)
victor@victor-laptop:~/git/libo/clone/writer$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: sw/source/core/inc/SwXMLBlockExport.hxx
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: sw/source/core/doc/docdesc.cxx
# both modified: sw/source/core/frmedt/fews.cxx
# both modified: sw/source/core/inc/UndoCore.hxx
# both modified: sw/source/core/inc/ascharanchoredobjectposition.hxx
# both modified: sw/source/core/inc/frame.hxx
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# 0001-Removal-of-bogus-comments-in-writer-module.patch
victor@victor-笔记本电脑：~/git/libo/clone/writer$git状态
#目前不在任何分支上。
#要提交的更改：
#（使用“git重置磁头…”取消分级）
#
#修改：sw/source/core/inc/SwXMLBlockExport.hxx
#
#未合并路径：
#（使用“git重置磁头…”取消分级）
#（酌情使用“git add/rm…”标记分辨率）
#
#两者都已修改：sw/source/core/doc/docdesc.cxx
#两者都已修改：sw/source/core/frmedt/fews.cxx
#两者都已修改：sw/source/core/inc/UndoCore.hxx
#两者都已修改：sw/source/core/inc/ascharanchoredobjectposition.hxx
#两者都已修改：sw/source/core/inc/frame.hxx
#
#未跟踪的文件：
#（使用“git add…”包含在将提交的内容中）
#
#0001-remove-of-bogus-comments-in-writer-module.patch
masteraBoriginmasterA---B
originmasterA---B
\
C---D---E
主控原点主控origin/masterorigin/mastergit statusgit format patchgit pullBForigin/masterBForigin/master源站主控源/主控origin/masterA---B
git格式补丁masterorigin/mastermastermasteraBoriginmasterA---B
originmasterA---B
\
C---D---E
主控原点主控origin/masterorigin/mastergit statusgit format patchgit pullBForigin/masterBForigin/master源站主控源/主控origin/masterA---B
git forma通过电子邮件发送更改的