Hi,
BTW I think part of the issue is that it didn't recognise that it has been
synced before when 4.9 was released so I think it though that all changes from
the initial creation of the 4.9 branch onwards needed to be applied. Seems
reasonable in the move form SVN to Git that sync point was los
Hi,
>> Did you use MergeTool? I'm thinking of downloading it and trying it out.
It may help a little but not a lot for simple changes as you still have to
resolve the conflicts.
It's certainly not quite as smart as SVN re conflicts but I guess it can't be
because of t's distributed nature.
Hi,
>>> What was the change to Version.as in the develop branch that conflicted.
Release was updated to 4.9.1 and develop to 4.10.0 so that resulted in a
conflict. With more frequent merges it may not be an issue.
> That wasn't a "yep" question. But I think I know the answer: we updated the
> V
>> What was the change to Version.as in the develop branch that conflicted?
> Yep.
That wasn't a "yep" question. But I think I know the answer: we updated the
Version.as in the develop branch. Do we need to do that? I think I saw in
the git branching model that they change the version in the
Hi,
> The git branching model seems to imply that changes to the release branch
> get merged into the develop branch at the end of the release. Did you only
> merge to trunk?
I merged from the 4.9 release branch into develop. This was never done/was out
of sync after we released 4.9.1.
The 4.9.
On 4/15/13 9:49 PM, "Justin Mclean" wrote:
> Hi,
>
> I went ahead and merged the release branch into develop, looks we've been a
> bit naughty and looks like quite a few changes went on in the release branch
> that didn't happen in develop.
The git branching model seems to imply that changes
Hi,
I went ahead and merged the release branch into develop, looks we've been a bit
naughty and looks like quite a few changes went on in the release branch that
didn't happen in develop.
Observations:
- Had no luck with git rebase it seemed to want to throw away needed changes
had much better
