我花了几个月的时间制作了一个大书架。几个月前我把它搁置了。现在我们要将它合并到主线中。
搁置的底座是四个月大的，而主线在那段时间里一直在前进。
是否有处理这种混乱的已知策略？
问问题
53 次
1 回答
2
Find a point in time from "a couple of months" ago and create a branch from that. Unshelve the changes into the branch. Commit the changes, then merge your branch back into the trunk. You may have to do a baseless merge; I'm not sure off the top of my head.
In the future, don't use shelvesets for this since they are not intended to be used as a replacement for branches. Shelvesets are intended to allow you to do short-term suspension of work in progress.
于 2015-08-07T23:24:26.257 回答