The idea here is to indicate what action I want to apply to each commit (keep it, squash it with its predecessor, edit it. # f, fixup = like "squash", but discard this commit's log message # s, squash = use commit, but meld into previous commit # e, edit = use commit, but stop for amending # r, reword = use commit, but edit the commit message If I run git rebase -interactive e6872a9, I first get to edit a file, with the following content : pick 59a2b18 really new beginning The end content of the commit will be exactly the same, and in your case you want to reword the message anyway.įrom the command line, with this history : $ git log -oneline -graph If you want to squash the commits together anyway, don't rearrange their order - changing the order is what causes the conflicts. I've no idea why there is a merge conflict? How to fix it? Is there anyway to get the squash commits working properly using sourcetree UI alone ( without using the git command line)? Then I click OK, but then, I got this message ( MERGING CONFLICT): In my case here, I arrange them so that all the minor fixes are subsumed under a major commit, and arranged in chronological order, and of course I also edit the commit message to make it clearer, as shown below per the instruction here: The first step is I click on "rebase children interactively on the previous commits", and then I try to rearrange the commits so that they represent the logical order I want them to be in. And of course I want to squash all these 3 commits into a proper commits such as "do feature a2a". ![]() I made a number of commits with self-descriptive names such as "A major part of the work", "minor fix", "fix 2" ( not yet pushed to remote). ![]() But I seem unable to do it using sourcetree UI. I'm trying to squash commits so that my repo history is not littered with unimportant commits like "minor fix 1", "minor fix 2".
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |