|
2015 Oct 21
Wed: |
| 05:07 |
< | OOPMan | | > |
Is there any good solution to this? |
| 05:07 |
< | OOPMan | | > |
The merge was a normal one so I can't easily rebase out the commits and force push |
| 05:07 |
< | OOPMan | | > |
Which is evil |
| 05:08 |
< | OOPMan | | > |
I think maybe my only other option is to recreate the staging branch from it's production equivalent and re-apply any merges missing? |
|
2015 Oct 23
Fri: |
| 04:14 |
< | osse | + | > |
*if |
| 04:14 |
< | jast | + | > |
yeah, much better |
| 04:14 |
< | jast | + | > |
also, that script is evil |
| 04:15 |
< | ffrrll | | > |
jast: oh rly? that works perfectly well, so thanks! however, i'm wondering if it is required to squeeze the commits in feature-1 before doing the rebase onto master? |
|
2015 Nov 03
Tue: |
| 13:10 -!- Eugene changed the topic of #git to: We use git, but don't be a git. Help given and wanted, or just dodge work. | Current stable version: 2.6.2 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | When you play the game of clones, you merge or you reset --hard. |
| 13:10 -!- Eugene was kicked from #git by Eugene [Eugene] |
| 13:10 |
< | Codeguru | | > |
bah! force pushing is evil. |
| 13:10 |
< | bunniez | | > |
ojacobson, he's leaving soon |