--Prepare

git add .

git commit --m "OMP-22-Purch-request <some text explanation"

After that do not run regular commit, just

git commit --amend --no-edit

git  push -f

git checkout development

git pull

-- back to our branch

git checkout OMP-22-Purch-request

-- REBASE:

git rebase origin/development

-- if there are conflicts, resolve them, and

git add .

-- !No commit or/and push please, instead:

git rebase --continue

git  push -f

--PULL REQUEST:

--Ready to create a pull request or refresh your pull request page if it already exists!

P.S application.groovy file is in .ignore not to be added/committed, since we need to change it, but sometimes we need to change it locally only.

To force to commit this file use the following command:

"It turns out that when adding a file to a repository you can force it to override .gitignore:

git add -f <filename>

or

git add --force <filename>