The layout has been distorted by the variable width font.
Below I used the 'Courier New' (select the text, then switch from "Sans
Serif" to Courier) to show what I think you described.
```
older ----> newer
(tag1)
/
A - B - C - D - E - F - G master
\ / \
P - Q _ | _ - R - S patch
\
L - M - N feature
```
the Patch
1. Created branch "patch" from "master" (at B)
2. Merged "patch" into master (commits P, Q creating merge D)
3. Created tag "tag-1"
4. created branch "feature" from master (at D) (work, work, added L,M,N
5. switched to "patch"(still at Q).
6. edited the patched area to also fit the later feature ( Added fix
R,S)
```
older ----> newer
(tag1)
/
A - B - C - D - E - F - G - H - I master
\ / \ / /
P - Q _ | _ - R - S / _ patch
\ /
L - M - N _ feature
```
I think it should be no problem to
1. merge your fixes S into master, creating merge H
2. merge your feature N into master to create merge I.
you have a choice at this step 2.
Instead of creating 'I', You could merge S (patch) into N (feature) to
create a *testable *merge O (still on feature). If that works, then you can
merge O onto master at H.
Does that help?
On Thursday, January 14, 2021 at 2:34:24 AM UTC adlter...@gmail.com wrote:
> Hi,I don’t know if what I understand is correct:
> before :
>
> feaure master
> | /
> | /
> (tag1)
> | \
> | patch
>
> now you commit at the patch branch and want merge it to tag1 :
>
> feaure master
> | /
> | / patch
> (tag1) /
> | \ /
> | \ /
>
>
> if u use 'git checkout patch 'and 'git merge tag1' ,it's alright.
> but now the you find you are in a deatch HEAD,
>
> may be tag this pointer again will be fine 'git tag tag-2'
>
> finally git graph:
>
> feature master tag-2
> \ | / \
> tag-1 patch
>
> hope I can help you 。
> If there is no misunderstanding.
> My English is poor.
>
> --
> adlternative
> 在2021年1月14日星期四 UTC+8 上午3:08:21<philip...@iee.email> 写道：
>
>> So, you now have three branches: master, feature and patch.
>> feature is ahead of master but is missing some fixes that are now on
>> patch (patch is ahead/behind master, that is, has differences both ways).
>>
>> There is no particular problem merging patch into feature - you should
>> get those extra changes without any real problem.
>>
>> The 'however' is what to do about master, which doesn't have the fixes
>> that are on patch. Only you can decide if you want or need those fixes also
>> to be merged into master. Once decided, it's easy to merge if required.
>>
>> OK?
>> P.
>>
>>
>>
>> On Tuesday, January 12, 2021 at 11:09:27 PM UTC gaston.g...@web.de wrote:
>>
>>> Hello,
>>>
>>> Is it possible to re-merge a branch after it has been merged and the
>>> merged branch has also been modified.
>>>
>>> In detail:
>>>
>>> I created a branch from the master branch for a patch.(let's call it
>>> "patch") In that patch I intrroduced also some small modifications which
>>> are necessary for the next "feature" branch.
>>>
>>> Th ereason I did this is that first these changes are not really part of
>>> the feature but required for it, and it was exactely the area I had to
>>> change anyway so not introducing these changes like this was like writing
>>> some useless code which would have to be reedited and replaced in the
>>> feature branch.
>>>
>>> Later, while working on the feature branch I realized that the changes
>>> done for it were not correct (working in the patch but not as expected for
>>> the feature).
>>>
>>> I could now of course just reedit th efeature and change it, but I
>>> preferr to change it in the "patch" branch and re-merge.
>>>
>>> Curse of action (git only, you understand that some editing took place
>>> in-between):
>>>
>>>
>>> 1. Created branch "patch" from "master"
>>> 2. Merged "patch" int master
>>> 3. Created tag "tag-1"
>>> 4. created branch "feature" from master
>>> 5. switched to "patch"
>>> 6. edited the patched area to also fit the later feature
>>>
>>> Now I would like to re-merge "patch" as it is now after the last edit at
>>> the same place it was where it was merged before (at tag-1) instead of
>>> merging it again at the current timeline position of my feature branch.
>>>
>>> Is this possible ?
>>>
>>
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/be0fa8ba-9477-4834-864e-57a0fc0059e0n%40googlegroups.com.
