V
V
Vova2016-11-07 16:38:48
git
Vova, 2016-11-07 16:38:48

How to make branch in git "backdating"?

Hello. I have brunch. I needed to take a new [branch] away from it and pour changes into it.
But I woke up and forgot to make brunch. But already done merge. And even resolved 100,500 conflicts.
Is it possible to somehow make the results of the merge get into the new branch at the time of the push, and not into the old one?
I really don't want to do merge from the very beginning.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
Saboteur, 2016-11-07
@saboteur_kiev

If everyone did this in the trunk, then you can try to do this:
your local trunk will go to the newfeature branch on the remote server.
Then locally you can try to return the trunk to the original, or even delete it and make a clone from scratch if the project is small.

J
jcmvbkbc, 2016-11-07
@jcmvbkbc

did merge. And even resolved 100,500 conflicts. I really don't want to do merge from the very beginning.

To solve this particular problem, you can enable git rerere (Reuse recorded resolution) by adding the section
[rerere]
enabled=true

in the repository config or in your .gitconfig

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question