Geek asks and answers

Git - Problems with Interactive Reboot and Distribution

I know that there are many questions about this, but I cannot find the answer that I am looking for at all.

I just merged the branch of my task into my master, and I am ready to push my changes to the remote branch of the master. However, they appear as two commits:

    commit 878c07412aab6a6b06b7fc8dd84c2418cc4f31d8
Merge: 9ffa590 c9f5552
Author: ***
Date:   Mon May 21 16:02:36 2012 +0100

    Merge branch 'modelUpdate4'

    Conflicts:
        ***.xcodeproj/project.pbxproj

commit c9f5552862872673317701c3dffd7fb6b6daa02c
Author: ***
Date:   Mon May 21 15:03:21 2012 +0100

    Modified model according to requests.  Repopulated seeded database.

This is the output of the git log and the two commits that I want to squash as one. However, when I do this:

git rebase -i HEAD~2

In fact, it just displays 4 previously committed (and pushed) commits. Do I really not understand how my branches merge? If I try and git rebase -i, it just displays the first commit in the list of git logs.

Thank!

+3
source share
1 answer

, , , (git log --oneline --decorate --graph) : master modelUpdate4, :

* (master, modelUpdate4, HEAD) Merge branch 'modelUpdate4'
| \
|  * (origin/modelUpdate4) Modified model according to requests. [HEAD^2]
|  |
|  * Another commit on modelUpdate4
|  |
|  * Yet another commit on modelUpdate4!
|  |
*  | (origin/master) Something that conflics with a commit in modelUpdate4 [HEAD~1]
| /
* Previous commit on master [HEAD~2]

HEAD~2 , HEAD modelUpdate4 master, master. HEAD^2 HEAD's , HEAD modelUpdate4. (. : http://paulboxley.com/blog/2011/06/git-caret-and-tilde)

HEAD~2 - , HEAD~2 master . modelUpdate4, .

* (master, HEAD) Merge branch 'modelUpdate4'
|
* Modified model according to requests.  Repopulated seeded database.
|
* Another commit on modelUpdate4
|
* Yet another commit on modelUpdate4!
|
* Something on master that conflics with modelUpdate4
|
* Previous commit on master

- , . , , . , .

origin/master. origin/modelUpdate4 git boonies, , , .

+3

More articles:


All Articles