我正在为LibreOffice做贡献,并开始学习git。我克隆了LibreOffice存储库并获得了成功的构建。 LibreOffice有19个git存储库1,名为bootstrap,保留在一个较低的级别,分别命名为writer,calc,postprocess,base等。它有一个脚本maned g
,用于在所有存储库中同时运行git命令而不是运行然后单独。
克隆后,我创建了一个在远程存储库中推送的补丁。此时我的所有更改都已提交(即git diff
没有输出),状态是我在master分支之前提交。
现在,当我运行./g pull -r
时,我得到了这个输出:
victor@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'.
显示了写模块(sw)中某些文件的一些问题,并且提到的文件是我提供的补丁中使用的文件中的一些。
git diff
显示了这一点:
victor@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)
和git status
显示了这一点:
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
如果我尝试通过手动编辑这些文件来解决冲突,git会告诉我我的主人已经与origin / master分道扬..这种情况在一个周期中持续。请帮帮我。问题是什么,我该如何解决?
答案 0 :(得分:1)
为什么git警告我,我的分支与主人有分歧?
Git警告你,你的分支已经脱离了主分支,因为你的分支已经脱离了主分支。
如果我理解了这种情况,首先你在B
之上创建了一个新的提交(我们称之为master
)(我们称之为A
)。 Git正确地说你是origin
master
之前的一次提交。
A---B
与此同时,其他人在origin
master
之上添加了新提交:
A---B
\
C---D---E
此时,您的master
和origin
master
分歧了。您有一个origin/master
没有的提交,origin/master
有3个您没有的提交。其中一个甚至可能是您发送的补丁(我在git format-patch
输出中看到了git status
创建的文件,因此我猜您将其作为补丁发送了);应用补丁不会创建完全相同的提交(至少提交者名称和时间戳将不同)。
当您执行git pull
时,git必须将您的提交(B
)与您没有的提交合并,创建合并提交(让我们称之为F
):< / p>
A---B-------F
\ /
C---D---E
请注意,同样origin/master
没有您的提交(此次B
和F
)。如果有人向origin/master
添加新提交,则必须再次合并。
现在,如何摆脱这种局面?有几种方法。一个是将您的更改推送到origin
,所以现在它拥有您拥有的一切。另一种方法是放弃您的提交并将master
重置为origin/master
。第三个是在origin/master
之上修改你的提交。
如果我正确猜测您是通过git format-patch
通过电子邮件发送了更改并且已经应用了这些更改,那么您的最佳解决方法就是将master
重置为origin/master
。为了避免将来出现此问题,最好在单独的分支中工作,并在从上游提取更改之前切换回master
。