Hi I just pulled from a repository in which a user created a new branch (and he should not) but interrupted the graph. So it looks using
git log --since=2years --graph --color=always --all --decorate --pretty=short |
git name-rev --annotate-stdin | less -R
As follows: the graph starts like
* commit 962fe4d0665264e16cca975d0d3a0f887a91ee99 (main) (HEAD -> main,
origin/main, origin/HEAD)
| Author: XXX
|
| correción función plot
The branch finished like this
And branch finished like
* commit a6ca1af6e8db2e96153a918c9bb9b40f02ccd787 (main~11)
| Author: XXX
|
| funcion mieuler
|
* commit 03ef0f5985d30b598d808b68e1ec85a0bb405d71 (main~12)
Author: Hugo Del Castillo Mola <hdelc...@ucm.es>
Limpiar commits
* commit d81bd81b396096fc02aac874a75bccd656183a99 (remotes/origin/default)
(origin/default)
| Author: XXX
|
| Quitar plot mirk4
|
Now I don't want him to use a branch called main.
(I am using mercurial and the hg-git plugin, so it is much easier for me
if the main branch is called default, I omit the reasons.
Now I cannot merge his main branch into default, well I can but there
are so many merge conflicts, that I refuse to solve them. So what is the
best way to solve this
1. Merge and then reset git to his change set?
2. Rename his branch again to default (but I am afraid that git gets
confused with the local branch called default and the one on
origin.)
So any suggestion would be very much appreciated.
Regards
Uwe Brauer
--
Warning: Content may be disturbing to some audiences
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
--
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/87fsbidgpo.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
