psi-jack/ultimate-vim
1
0
Fork 0
mirror of synced 2024-11-14 05:08:56 -05:00
Code Issues Releases Wiki Activity
ultimate-vim/sources_non_forked/nerdtree/.github/PULL_REQUEST_TEMPLATE.md
geezuslucifer@gmail.com 43c7efba8d Merge remote-tracking branch 'refs/remotes/upstream/master' 
Conflicts:
	sources_non_forked/ale/autoload/ale.vim
	sources_non_forked/lightline.vim/doc/lightline.txt
	sources_non_forked/nerdtree/.github/PULL_REQUEST_TEMPLATE.md
	sources_non_forked/nerdtree/autoload/nerdtree.vim
	sources_non_forked/nerdtree/plugin/NERD_tree.vim
	sources_non_forked/vim-fugitive/autoload/fugitive.vim
	sources_non_forked/vim-fugitive/doc/fugitive.txt
2021-02-19 08:50:18 -06:00

2 KiB
Raw Blame History

Description of Changes

Closes #

New Version Info

<<<<<<< HEAD

  • Derive a new version number. Increment the:
    • MAJOR version when you make incompatible API changes
    • MINOR version when you add functionality in a backwards-compatible manner
    • PATCH version when you make backwards-compatible bug fixes
  • Update CHANGELOG.md, following this format/example: 
    #### MAJOR.MINOR...
- **.PATCH**: PR Title (Author) [#PR Number](link to PR)

#### 5.1...
- **.1**: Update Changelog and create PR Template (PhilRunninger) [#1007](https://github.com/scrooloose/nerdtree/pull/1007)
- **.0**: Too many changes for one patch...

=======

Author's Instructions

  • Derive a new MAJOR.MINOR.PATCH version number. Increment the:
    • MAJOR version when you make incompatible API changes
    • MINOR version when you add functionality in a backwards-compatible manner
    • PATCH version when you make backwards-compatible bug fixes
  • Update CHANGELOG.md, following the established pattern.

Collaborator's Instructions

  • Review CHANGELOG.md, suggesting a different version number if necessary. <<<<<<< HEAD
  • After merge, tag the merge commit, e.g. git tag -a 3.1.4 -m "v3.1.4" && git push origin --tags

27ad0d0786 =======

  • After merging, tag the commit using these (Mac-compatible) bash commands: 
    git checkout master
git pull
sed -n "$(grep -n -m2 '####' CHANGELOG.md | cut -f1 -d: | sed 'N;s/\n/,/')p" CHANGELOG.md | sed '$d'
git tag -a $(read -p "Tag Name: " tag;echo $tag) -m"$(git show --quiet --pretty=%s)";git push origin --tags

master