![]() As Alyst mentioned, in case of conflict, it should "pause" rebasing (as above with "edit") and let user fix the conflicts as usual.It "pause" rebasing at the selected commit so user can make changes to it - edit files, edit commit message, I think also split this commit to more commits. Very interesting and useful command from interactive mode is "edit".I read squash should be possible in Outgoing view when I use same commit message for some commit and then move it to another - so that should upply the fixup, but it doesn't sound very comfortable. If you run the command git branch -a from the command line, you will see a list of all the branches you. Now create a new remote named upstream with the URL of the originalâs Git repo. Also there is option to "squash"/"fixup" (they differ just by either appending the log message to the new commit, or ignoring the log message). What you want to do is get the URL for the original (aka: upstream) repo - in this case itâs the URL for the Office UI Fabric repo.Sure I can reorganize commits one by one in Outgoing view, but that's slow (as I need to wait for rebase to finish before I can reorganize another commit and do it x times) In interactive mode I can quickly prepare changes (reorganize, ignore, squash.) to commits and then start it all at once.Ability to alter commits during rebase, not before, so if anything goes wrong, I still can go back to unchanged original branch easily. ![]() ![]() From my point of view interactive rebase provides these features I miss in SmartGit GUI:
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |