Home/ Questions/Q 6681807
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-26T04:37:55+00:00

I am experimenting with branching on git and running into nightmare after nightmare. Anyway,

  • 0

I am experimenting with branching on git and running into nightmare after nightmare. Anyway, the current issue is that I wanted to merge the master into the branch. I tried “git rebase” because some site recommended that, and it did a number of destructive things but definitely did NOT merge my trunk into the branch. It actually blew up everything quite horribly and created all kinds of complicated merge errors and I cannot figure out how to simply revert my code to where it was before.

My question is twofold:

1) How do I make git completely revert to the point just before the git rebase? Everything I try gives me all kinds of headaches about merge errors. I don’t want to merge anything. I just want to take a specific revision exactly as it was and make that the HEAD.

2) Once I get the mess cleaned up, how do I merge a trunk into a branch? For what it’s worth, the merge should not be all that complicated in terms of conflicts.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    1. Try git reset --hard to throw out the changes (including conflicts) in the working directory and reset your branch to its pre-merge-attempt state.

    2. From the branch you want to merge into, use git merge <other branch>. If there are conflicts, resolve them by opening the files and merging the lines between the <<<<< and >>>>> conflict markers, then git add <merged file>. When you have manually resolved all the conflicts, git commit to finish the merge.

    • 0