'incoming and current in a rebase
There is a similar question to this one but its scope is too general and the response overly complicated. My question is very punctual
When from my branch MyBranch and doing a rebase like git rebase master
and having a conflict
which is incoming change? and which is current change?
Please don't close this question linking it to previously said overly general and overly complicated answer that covers rebases, merges, etc. This question is ONLY about rebase
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|