You may or may not have to go through resolving and then continue.įinally, say commit. In the options dialog, you have to pick Merge to Working Tree (otherwise the commit happens without you being able to pick any options, i.e. Right-click on feature branch, say Merge. History is now looking clean, your commits being in line, aka fast-forwardable: Pick (o)Tracked or matching branch and -important- Force Pushing (since you are “changing history” of your feature branch.) As hollow orange circles, since things are not yet committed.Ħ) right-click on feature branch, say Push to. Press the Button in the dialog to confirm.ĥ) You got the feature commits played on top. ➝ trouble, that won't become so obvious for several steps.). (Having yellow and green next to each other assures you that there is no push or pull pending.)Ĥ) right-click on the master tip (line1) pick Rebase HEAD to. You should have checked out your feature branch and be on its tip (head-revision), the yellow-green label tells you.feature and master branch, all pulled and pushed. before: rebase feature branch (recommended) Here's the typical situation: Things developed on your feature branch, meanwhile the world kept turning and more stuff happened on the common master branch. But if you had to do multiple changes at once, this was not perfectly handy. All the work from the branch is accumulated into a single commit with a single message :-) Former SmartGit versions already allowed to reorder or squash commits in the Journal view immediately. The last (top most) commit was done using "git merge -squash ABC_work_in_progress" but all the commits are swallowed so it's a clean history. The branch was called XYZ_work_in_progress. You can see that all the intermediate commits (including the messages) are visible in the history. The second commit from the top was done using SmartGIT. are denoted by a inaccessible state - Squash: authorship defaults to oldest author with most recent date. I guess I'm missing the "Simple commit" option?! Maybe I don't understand the instructions^^Įdit 2: Here is a screenshot of the Log. I can delete the work_in_progress branch afterwards, all fine, but I want a single commit with a single commit message in the history of the master branch.Įdit: Here is a screenshot from my commit dialog. I have tried it and I still see all the small commits in the log. The documentation here How to perform normal merges and squash merges simply does not work. The documentation here How to perform squash merges seems to be wrong because there is no option "Branch consisting of selected commit and its ancestors". Usually this is one single command when merging using the -squash parameter. When I'm finished I want to merge squash to master branch. All of them have redundant commit messages. I have a branch called work_in_progress which is used to debug and test code with many small commits.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |