Atlassian Corporation
Correcting comment drift in merges in a version control system

Abstract:

In an embodiment, a computer-implemented method provides causing displaying in a first screen of a first GUI a first toolbar and a second toolbar. The first toolbar has options related to a branch of source code, including a first option to show a difference between a current version and a previous version of the source code, and the second toolbar has of options related to two branches of source code, including a second option to set up a pull request of merging changes from a source branch into a destination branch. The method further provides receiving a selection of the first option; and causing displaying in the first screen of the GUI a first panel and a second panel. The first panel has a current version of source code in a first branch and an indicator of any difference from a previous version, and the second panel has a current version of source code in a second branch and an indicator of any difference from a previous version. The method also provides receiving a selection of the second option; and causing displaying in a second screen of the GUI a third option to specify an original branch as the source branch, a fourth option to specify a target branch as the destination branch, and a default value for the third option or the fourth option identifying the first branch or the second branch.