release notes: fix typo: resulotion→resolution #962

Open

tuxayo wants to merge 1 commit from tuxayo/patch-1 into develop

tuxayo commented

2017-05-31 11:41:12 +00:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

RELEASENOTES.md

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'release notes: fix typo: resulotion→resolution' (#962) from tuxayo/patch-1 into develop

Merge commit body

Reviewed-on: https://git.nullptrlabs.io/pgmodeler/pgmodeler/pulls/962

Merge pull request 'release notes: fix typo: resulotion→resolution' (#962) from tuxayo/patch-1 into develop

Reviewed-on: https://git.nullptrlabs.io/pgmodeler/pgmodeler/pulls/962

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin tuxayo/patch-1:tuxayo/patch-1

git switch tuxayo/patch-1

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop

git merge --no-ff tuxayo/patch-1

git switch tuxayo/patch-1

git rebase develop

git switch develop

git merge --ff-only tuxayo/patch-1

git switch tuxayo/patch-1

git rebase develop

git switch develop

git merge --no-ff tuxayo/patch-1

git switch develop

git merge --squash tuxayo/patch-1