Hi Yakov, Along with fixing tests and issues I'll probably be learning using git > rebase: looks like it is an exact tool to deal with this mess > <https://github.com/YakovL/tiddlywiki/network>. If there are any > suggestions regarding this, let me know (as well as suggestions of how to > merge on GitHub in a proper way or other things regarding git/github > workflow).
I do use the following workflow (for TiddlyWiki5), which never caused merge conflicts for me. I'm using 2 aliases for my local git repos: - origin ... points to my github account, where I do have write access. - upstream ... points to the "main project" account ... which only merges to master with pull requestes, even if I have write access! The most important rule for me is: - Never, ever *commit and push* to *origin remote master *branch! Except for - git status ... if working tree is clean I can go on. If not I need to commit to a "feature-branch" or I simply do a "git stash" - git checkout master - git pull upstream master - git push origin master .... to update origin repo. *My local workflow looks like this: * - git status ... if working tree is clean I can go on. If not I need to commit to a "feature-branch" or I simply do a "git stash" - git checkout master - git pull upstream master - git checkout -b new-feature-branch - git add . - git commit -m "detailed info" - git push origin new-feature-branch - Create a PR with github web UI. - Once the PR is merged start over with git status ... have fun! mario -- You received this message because you are subscribed to the Google Groups "TiddlyWikiDev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/tiddlywikidev. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywikidev/dfcb5225-f37f-495b-91a0-2dc7acdd271a%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
