296
edits
Changes
From Gramps
Git
,→Workflow: how to cope with git being out of sync with svn
'''Caution''': Do not attempt to push changes back to the git mirror.
Note that the upstream git repository doesn't instantly get in sync from the SVN, so after you perform the dcommit operation
you might see something like
Your branch is ahead of 'mirror/trunk' by 2 commits
If, after that, you try to do a dcommit and it complains about being out of sync, don't try to do a "git pull --rebase", or you'll rewind your index back to the last git update point! You can try to fix it instead with
git svn fetch -p
git svn rebase
and then dcommit again.
=== hacking svn properties ===
