Hi,
This message is intended for those who are pulling from the Git mirror
of the Mercurial repository that I am maintaining [1].
Due to how the Mercurial "vim73" branch was forcibly renamed to be the
"default" branch you need to be careful when next updating your Git
clone. If you try "git pull" you'll get merge conflicts!
If you have _no_ local changes this is how to update:
$ git checkout master
$ git fetch origin
$ git reset --hard origin/master
The "master" branch will now be tracking the latest changesets from
the Mercurial "default" branch.
(If you accidentally did a "git pull" you'll get lots of merge
conflicts because Git will try to merge the latest Mercurial changeset
[i.e. patch 7.3.002] into the vim72 branch. No good! If you already
did "git pull", then "git reset --hard origin/master" will put things
right.)
If you have local changes based off the "hg/vim73" branch, then I'd
suggest you update "master" as above and then rebase your changes on
top of "master" afterwards.
If you have made changes in your "master" branch (you shouldn't have!)
then I'd suggest you create a new branch ("git checkout -b mystuff
master"), do the above, then cherry-pick the commits back.
You only need to do this once. The next time you update you can use
"git pull" as usual.
Björn
[1] http://github.com/b4winckler/vim
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
