- git checkout 3-some
- делаю изменения
- git add .;git commit;git push origin 3-some
Далее
- git checkout master
- git merge 3-some
Updating 5c5e62d..c463210
Fast-forward
app/apps/dictionaries/urls.py | 40 +---------------------------------------
1 file changed, 1 insertion(+), 39 deletions(-)
- git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
- git add .;git commit;git push origin master
Looking in links: /python-packages
test_upper (test_example.TestExample) ... ok
----------------------------------------------------------------------
Ran 1 test in 0.000s
OK
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
Total 0 (delta 0), reused 0 (delta 0)
To bitbucket.org:some-name.git
5c5e62d..c463210 master -> master
В визуализации и на битбакет нет мерджа ветки в мастер