Geek asks and answers

Git, two commits that did not merge together properly

We have two git, as shown below, they are not combined together for any reason (the upper part does not contain changes from the one below).

git unmerged

(I'm not sure why my image is not working ... it looks like this)

* 5d0a88b (parent is 770c522)
|
* \  770c522 (missing files from a135e1a))  (parent is 8a25483)
   |
* -|  a135e1a   (parent is 8a25483)
   |
   * 8a25483 (this is the parent of both commits above)
   |
   *  
   |
   *

I tried to combine a135e1a into my current working copy using

git merge a135e1a

but he tells me that the merger was successful.

+3
source share
1 answer

Thanks guys, any of these comments may have worked, but I had to fix this before they came. In the end, I checked the two commits on separate local branches and then merged them (which worked). Then I copied the generated code on top of my workspace and made a commit.

, , .

0

More articles:


All Articles