Hi Mark,
On Thursday, July 27, 2017 at 12:48:25 AM UTC+2, Mark Waite wrote:
>
> Yes, your simplification expresses what I was trying to achieve.
>
Good, then we understood each other, thanks for confirming :)
> I specifically merged from master to one so that one could be tested with
> the me
Yes, your simplification expresses what I was trying to achieve.
I specifically merged from master to one so that one could be tested with
the merge from master. The subsequent merge from one to master was to have
master include a commit which shows one merged into it. Same pattern for
master to
Hi JNickVA,
On Wednesday, July 26, 2017 at 8:44:13 PM UTC+2, JNickVA wrote:
> 3. and 4. I don't even have enough information to know the state of the
> master when each of the 2 branches were created
>
What do you mean here? Isn`t Git history showing you the exact state of
"master" when each o
Hi Mark,
On Tuesday, July 25, 2017 at 2:58:21 PM UTC+2, Mark Waite wrote:
>
> You might consider a series of steps to perform the merge. Some of the
> steps might include:
>
>1. Merge from master to branch one so that the diffs between branch
>one and master are only changes on branch o
Mark,
I appreciate your response and I am adding to it a little by first
determining when the production code was compiled and deployed. I can
compare dll file sizes and the file creation dates to narrow it down. Then,
I will proceed in pretty much the way you describe. Thank you for your help.
Michael,
1. At this stage I am not sure that what is in production is represented by
the master branch, and if it was at one time, when that might have been.
2. I am taking over the project from a group of developers who have been
working remotely with little ort no supervision. I have 2 weeks t
On 2017-07-25, at 5:38 AM, JNickVA wrote:
> I have recently been put in charge of a code repository that contains a
> MASTER and several branches. My task is to try to merge the root and the top
> two most frequently used branches into a new repository. I face two problems:
> the branches hav
You might consider a series of steps to perform the merge. Some of the
steps might include:
1. Merge from master to branch one so that the diffs between branch one
and master are only changes on branch one, test the resulting merge.
Review and understand the remaining differences between