I'm using svn
for version control and have the following question:
Let's say I develop something in my
feature branch
and constantly upstream changes from thetrunk
(by simply merging them and resolving conflicts). Now, at some moment I made my last upstream merge fromtrunk
and resolved the conflicts. And, for example, right after thatmerge
I somehow manage to "freeze" thetrunk
- all commits totrunk
are being rejected and it always remains in the same state.Does this guarantee the absence of conflicts when I perform the
merge --reintegrate
for myfeature branch
? Or I am missing some other conditions and actions, which might possibly lead to them?