branch - How do I manage conflicts with git submodules? -


I have a git superproject that references multiple submodules and I want to lock the workflow for my other project members Trying to work in.

For this question, I say that my superproject is called supery and the episode is called subby . (Then what I'm trying to do is a simplification of ... I'm not really using branches for versions, but I thought it would be the easiest to put this into question.)

supery referenced as a code in the master branch of

my supery The one.one named and the reference of the submodule to v1.1 of subby .

I can work within these branches without a strike, but if I get some opposition from one.one branch to guru branch And how do I solve them?

Actually a git drag master after a is running while Subby is in the branch, it seems that it makes an additional point.

$ git checkout master $ git before

Submodule qw3rty ... 321e subbie (v1.0) $ git checkout a $ git submodule asdfgh ... 456d sabby (v1.1)

But after the bridge, when I < Code> git submodule then add additional submodules: 

  $ git drag master auto-merged schema CONFLICT (submodule): Conflicts in sub-clash - need qu3rty Is ... 321e Automatic Merge Failed; Correct the conflicts and then commit the results. $ Git submodule qw3rty ... 321e Subbike (v1.0) asdfgh ... 456d SubBee (v1.1) zxcvbn ... 7890 SubBee (v1.1 ~ 1)

How to Do I delete / ignore unwanted subdomain references and reduce my conflicts and changes? Or is there any parameter I can use with my original git pull which will ignore my subdomains?

I have not seen the exact error before but I think the problem you are facing It has been estimated about it. It seems that because there are different riffs for subby submodule in the branches of master and one.one supery When you do not merge the changes with the Master git, which is the referee - v1.0 or v1.1 - to the One.one branch of supery

If this is the case, then you have to select the referee you want and resolve that conflict to make that change. That's what you're doing with the reset command.

This is a difficult aspect of tracking different versions of a subdue in different branches of your project. But the submodule ref is like any other component of your project. If two separate branches continue to track the same related submodule riff after the merge, then git should be able to form patterns without taking the merge collision in the future. On the other hand if you frequently switch to Adulum refresh, you may have to face many conflict disputes.


Comments

Post a Comment

Popular posts from this blog

python - Overriding the save method in Django ModelForm -

I'm having trouble overriding a ModelForm save method. I get this error I'm: Exception type: TypeErier Exception Value: Save () found an unexpected keyword argument 'committed' My intentions include a form 3 fields Submit several values ​​for, then create an object for each combination of those areas, and to save each object file models.py class collarsult type (models.Model): id = model. AutoField (db_column = 'icontact_result_code_type_id', primary_key = true) callResult = models.ForeignKey ( 'CallResult', db_column = 'icontact_result_code_id') campaign = models.ForeignKey ( 'campaign', db_column = 'icampaign_id') CALLTYPE = models.ForeignKey ( 'CALLTYPE', db_column = 'icall_type_id') agent = models.BooleanField (db_column = 'bagent', default = true) teamLeader = models.BooleanField (db_column = 'bTeamLeader', default = true) active = models.BooleanField (db_column = Django.form...
Read more

html - CSS autoheight, but fit content to height of div -

I have a div in which there are three children- div in the left and middle div: float: left while true: float: true because it is my layout Actually will spoil, I've used ClearFix Hack: .cf {zoom: 1; }. Cf: First,. Cf: {content: ""; Display: Table; }. Cf: After {clear: both; } It still works, but I want to be the right div an indicator. So it should fill 100% of the parent unit of height. How can I complete this? PS is the full code: & Lt; / Div & gt; & Lt; Div class = "mobile_content" & gt; & Lt; H5 & gt; {{Data.titel}} & lt; / H5> & Lt; Table & gt; & Lt; TR & gt; & Lt; Th & gt; Komponist: & lt; / Th & gt; & Lt; TD & gt; {{Data.komponist}} & lt; / TD & gt; & Lt; / TR & gt; & Lt; TR & gt; & Lt; Th & gt; Instrument: & lt; / Th & gt; & Lt; TD & gt; {{Data.instrumente}} & lt; / TD & gt; & Lt; / TR & gt;...
Read more

qt - How to prevent QAudioInput from automatically boosting the master volume to 100%? -

I have been trying to use Qt5 multimedia to record audio with QAudioInput, however, when I see If QAudioInput is started, it increases the master volume of my sound device to 100%. How can I prevent QAudioInput from changing the master volume? My current development platform is Linux with PalsAdio (with flat audio disabled). How can I use QAudioInput : QAudioDeviceInfo device_info = QAudioDeviceInfo :: defaultInputDevice (); QAudio format format; Format.setSampleRate (44100); Format.setChannelCount (1); Format.setSampleSize (16); Format.setCodec ("Audio / PCM"); Format.setSampleType (QAudioFormat :: SignedInt); Format.setByteOrder (QAudioFormat :: LittleEndian); Std :: cout & lt; & Lt; Device_info.deviceName (). ToUtf8 (). ConstData () & lt; & Lt; Std :: endl; QAudioInput * default_device = new QAudioInput (device_info, format); QIODevice * default_io_device = default_device-> Start (); a QAudioInput.setVolume () method is not you I ...
Read more