Commit 77d09e1
authored
Attempt to merge changes from heroku before pushing new version (#4)
Why:
When trying to push changes to heroku, sometimes it gets stuck because there are some changes made from someone else besides this action which means that it needs to merge those changes to the branch its trying to push. We only want to manage deploys via this action so there's no need to be careful when pushing changes to heroku.
This addresses the issue by:
- Adding --force to git push so it is always able to deploy.1 parent dc668ba commit 77d09e1
2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
0 commit comments