So what is the proper way to continuously perform the workflow we're
trying to do - that is pull changes from origin path into branch, push
changes to origin branch from branch, and repeat.
Using bidirectional merge (without reintegrate) seems create severe
merge conflicts.
Short answer:
On Sun, Feb 24, 2013 at 12:14:04PM +, Andreas Tscharner wrote:
So what is the proper way to continuously perform the workflow we're
trying to do - that is pull changes from origin path into branch, push
changes to origin branch from branch, and repeat.
Using bidirectional merge
Yes I have used git, etc - in the past, but we are forced to use svn
for the time being.
What I would like to quantify is if this shortcoming of subversion is
by design or if its a bug. From your description, it seems like the
former, and if so, what is the architectural reasoning?
I understand
I guess I should have read the next response in the thread before replying...
On Feb 24, 2013, at 7:52 AM, Stefan Sperling s...@elego.de wrote:
On Sun, Feb 24, 2013 at 12:14:04PM +, Andreas Tscharner wrote:
So what is the proper way to continuously perform the workflow we're
trying to do
On Sun, Feb 24, 2013 at 07:55:41AM -0500, James Hanley wrote:
Is this a use case that was taken into consideration, and will it be
fixed or the functionality/logic added to allow this use case?
See my other reply for more details, but yes, this is being addressed:
On Sun, Feb 24, 2013 at 07:57:14AM -0500, James Hanley wrote:
I guess I should have read the next response in the thread before replying...
So, to be clear (since you asked off-list):
The following changes to your script prevent the tree conflict with 1.7.
--- enduceTreeConflict.sh.orig Sun
Okay - I read through and understand the use of reintegrate - but that
is what we are using and the script provided in the original post
uses. The issue is that even with its use, I'm getting a tree
conflict. Please read and test the script from the original post.
On Feb 24, 2013, at 7:59 AM,
Okay - I read through and understand the use of reintegrate - but that
is what we are using and the script provided in the original post
uses. The issue is that even with its use, I'm getting a tree
conflict. Please read and test the script from the original post.
Meant to reply all (twice)
On
