|
|
|
|
|
|
by solutionyogi
4017 days ago
|
|
|
True. You do have to fix all the true conflicts. But you have to do it only once. If you merge your master, you have to resolve conflicts every time you merge from the master. git rerere could be potentially useful here. Even more importantly rebase allows you to resolve conflict at individual commit level. During conflict, you can see the exact commit that is causing it, making it much easier to resolve it. See: http://jeffkreeftmeijer.com/2010/the-magical-and-not-harmful... |
|
|