Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(#1085): help files initial commit #1579

Merged
merged 1 commit into from Apr 21, 2018
Merged

fix(#1085): help files initial commit #1579

merged 1 commit into from Apr 21, 2018

Conversation

vomikan
Copy link
Member

@vomikan vomikan commented Apr 21, 2018

make sure your code would work on both windows, linux and osx


This change is Reviewable

@vomikan vomikan merged commit 16e9a59 into moneymanagerex:master Apr 21, 2018
@slodki
Copy link
Contributor

slodki commented Apr 21, 2018

@vomikan every PR you change database submodule - please verify this before merging to master

@vomikan
Copy link
Member Author

vomikan commented Apr 22, 2018

@slodki I didn't change submodule. Even clone repository from scratch. Seems something wrong in my logic.

@slodki
Copy link
Contributor

slodki commented Apr 22, 2018

You should:

  • use git submodule update --init --recursive to update submodule wroking tree to state requested by MMEX main project for checkouted branch/commit

    Update the registered submodules to match what the superproject expects by cloning missing submodules and updating the working tree of the submodules.

    switching branch or commit in main project can leave submodule not updated!

  • don't use git commit -a but manually control files/dirs added to commit created (use git add and verify using git status)

  • verify modified files included in commits using git diff --stat origin/master..HEAD before pushing / merging changes
    GitHub will present submodule updates in commit details too.

slodki added a commit to slodki/moneymanagerex that referenced this pull request Apr 23, 2018
this fixes accdental database submodule downgrade in PR moneymanagerex#1579
slodki added a commit that referenced this pull request Apr 23, 2018
this fixes accdental database submodule downgrade in PR #1579
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants