|
|
|
|
|
|
by maddening
4171 days ago
|
|
|
It can be solved with a right branch naming policy. E.g. where I work we usually name branches like "wp/BTS-number/1" for first attempt to do the BTS-number task, "wp/BTS-number/2" when we somehow need to try another approach or rebase or squash history, "wp/BTS-number/3" for next attempt and so on. But its a global policy so "wp" and "wp/BTS-number" will always be a folder, and conflicts should never happen. |
|
|