Right-click the first of the two commits (mind the chronological order!), and select Interactively Rebase from Here… Open the Git tool window via View > Tool Windows > Git, or by using the Git button at the bottom of Android Studio. Nothing easier than that! With Android Studio’s interactive rebase UI, I can use the fixup operation to merge my latter commit into the former. To remove any signs of the embarrassing naming mistake I made, I’m going to rewrite the commits on my branch. Consider writing the following method in your Android app: Let’s look at how it works! Whoops! A Typpo.įirst, we’ll take a quick look at one of the many uses of interactive rebasing. Building on top of Git’s regular git rebase command, interactive rebasing allows users to modify single commits of the rebased branch by applying transformations such as commit renaming, reordering of all commits, removal of unwanted commits, merging of two or more commits into one, and more.Īs an Android developer who likes to stay inside my preferred IDE as much as possible, I’m happy that Android Studio offers an easy-to-use integration of interactive rebasing that serves all my needs for commit housekeeping.
One particularly useful tool for keeping a clean commit history on a working branch is Git’s -interactive rebase option.
Our teams pride themselves on a clean commit history - not only on our main branch, but also inside the working branches maintained by individuals. At PSPDFKit, we host all our projects on GitHub, and many of them inside our monorepo, which currently counts about 50 active contributors. For most developers, Git is the go-to version control system for their software projects.
0 kommentar(er)
