➜ homelight git:(production) git merge --no-ff hotfix-fix-dre-format-imports
Merge made by the 'recursive' strategy.
app/controllers/admin/imports_controller.rb | 1 +
app/models/mapped_format.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
➜ homelight git:(production) git co staging
Switched to branch 'staging'
➜ homelight git:(staging) git pull
Already up-to-date.
➜ homelight git:(staging) git merge --no-ff hotfix-fix-dre-format-imports
Merge made by the 'recursive' strategy.
app/controllers/admin/imports_controller.rb | 1 +
app/models/mapped_format.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
➜ homelight git:(staging) git co master
Switched to branch 'master'
➜ homelight git:(master) git pull
Already up-to-date.
➜ homelight git:(master) git merge --no-ff hotfix-fix-dre-format-imports
Auto-merging app/controllers/admin/imports_controller.rb
Merge made by the 'recursive' strategy.
app/controllers/admin/imports_controller.rb | 1 +
app/models/mapped_format.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
➜ homelight git:(master) git push
Counting objects: 36, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (20/20), done.
Writing objects: 100% (20/20), 1.69 KiB, done.
Total 20 (delta 18), reused 0 (delta 0)
To [email protected]:homelight/homelight.git
2685f98..c4c0edf master -> master
f8275e9..f20b5c1 production -> production
c644f9a..aaf7cb3 staging -> staging
➜ homelight git:(master)