这是问题所在。我是我的git repo(Laravel应用程序),我有三个分支dev
,html
和...
public
resources
|-assets
|-sass
routes
...
。
主分支(Laravel应用程序)
...
sass
...
html分支
sass
我需要做的是在更新sass
分支中的html
目录时更新laravel应用程序的submodule
目录。
我尝试在master分支中创建"{
\"WFLYCTL0080: Failed services\" => {\"jboss.deployment.unit.\\\"test.war\\\".WeldStartService\" => \"org.jboss.msc.service.StartException in service jboss.deployment.unit.\\\"test.war\\\".WeldStartService: Failed to start service
Caused by: org.jboss.weld.exceptions.DeploymentException: Exception List with 2 exceptions:
Exception 0 :
org.jboss.weld.exceptions.DeploymentException: WELD-001409: Ambiguous dependencies for type MessageSender with qualifiers @Default
at injection point [BackedAnnotatedField] @Inject @B private test.AccessService.messageSenderB
at test.AccessService.MessageSenderB(AccessService.java:0)
Possible dependencies:
- Managed Bean [class test.messagesender.impl.MessageSenderBImpl] with qualifiers [@Any @Default],
- Managed Bean [class test.messagesender.impl.MessageSenderAImpl] with qualifiers [@Any @Default]
,但这似乎不是正确的方法。
有可能吗?
答案 0 :(得分:0)
通常,在同一个存储库的分支中管理完全不同的事情不是一个好主意。将分支用作开发链很有用,最终将其合并到您的主分支中。合并几乎没有共同点的分支(例如,仅多个文件夹中的一个)总是有些痛苦。
这里可以使用子模块方法。您需要为Private Function StackOverflowTest() As String
Dim x As String = "aa[12]bb[34]cc[56]dd[78]"
Dim FinalString As String = ""
Dim NumberFound As Boolean = False
For Each ch As Char In x.ToCharArray()
If Char.IsDigit(ch) Then
FinalString += ch
NumberFound = True
Else
If NumberFound Then FinalString += " "
NumberFound = False
End If
Next
FinalString = FinalString.Remove(FinalString.Length - 1, 1)
MsgBox(FinalString)
Return FinalString
End Function
创建一个单独的存储库,并将该存储库作为子模块集成到主存储库中,即用新创建的子模块替换主存储库中的C:\WinDDK\7600.16385.1\My\First>build
path contains nonexistant c:\windows\system32\openssh\, removing
BUILD: Compile and Link for x86
BUILD: Loading c:\winddk\7600.16385.1\build.dat...
BUILD: Computing Include file dependencies:
BUILD: Start time: Wed May 22 14:53:12 2019
BUILD: Examining c:\winddk\7600.16385.1\my\first directory for files to compile.
c:\winddk\7600.16385.1\my\first Invalidating OACR warning log for 'WDKSamples:x86chk'
BUILD: Saving c:\winddk\7600.16385.1\build.dat...
BUILD: Compiling and Linking c:\winddk\7600.16385.1\my\first directory
Configuring OACR for 'WDKSamples:x86chk' - <OACR on>
_NT_TARGET_VERSION SET TO WINXP
1>errors in directory c:\winddk\7600.16385.1\my\first
1>NMAKE : fatal error U1073: don't know how to make 'c:\winddk\7600.16385.1\my\first\objchk_wxp_x86\i386\testdriver.obj'
1>nmake.exe /nologo BUILDMSG=Stop. -i BUILD_PASS=PASS2 LINKONLY=1 NOPASS0=1 MAKEDIR_RELATIVE_TO_BASEDIR=my\first failed - rc = 2
BUILD: Finish time: Wed May 22 14:53:18 2019
BUILD: Done
0 files compiled - 1 Warning - 2 Errors
文件夹。有关子模块的更多信息,请参见git documentation on Submodules。