• On the main image, all changes were made in submodules and base. for example, in the LU module, higlighted LU has 2 changes.
  • You can see those changes by clicking on those files.
  • There will be a letter (A, D, M) on the right ( A=> Add, D=> Delete, M=> Modified ).
  • On commit, textbox adds a message related to your commit e.g "Area and GroupPerm Polices added".
  • And press the Tick mark on the top of the input field to commit the change.
  • This will be done on every module
  • In the base directory, if only the modules are changed, you can write '.' in the message.
  • When you finish all commits, you must sync changes with the button on each module.
  • If you don't see the changed module on left, like now, only search for something inside it
    CTRL+P and search.

If you see this error: fatal: refusing to merge unrelated histories:
  • go on the bash inside the base or module folder
  • and write git pull --allow-unrelated-histories
  • The files with ! on the right are conflicted files, between the current and remote versions.
  • You can select all files with shift and usually select "Accept All Incoming".

If the conflicts do not resolve:
  • we can use 'smartgit' then (download and install if you do not have it).
  • In 'smartgit' the conflicted files can be resolved by checking resolve>take theirs or take ours.
  • If you modified the file and then stage. the module folders in the base must not be revolved, but only staged.
  • Then commit and push
If show the error shallow update not allowed during push:
  • git fetch --unshallow
  • git push origin master -f
Always check you are working in the branch master in every base and modules:
  • If you are not in master, in the bash write
  • git checkout master && git submodule foreach git checkout master
  • and then re-pull, or in vscode, or smartgit, or write git pull && git foreach submodule git pull

Published on • min read

More Articles