Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.Git.merge()

110
111
112
113
114
115
116
117
118
119
120
    commitOneFileChange("on side");

    git.checkout().setName("master").call();
    commitOneFileChange("on master");

    git.merge().include(repository.getRef("side")).call();
    assertEquals(RepositoryState.MERGING, repository.getRepositoryState());

    StagingViewTester stagingView = StagingViewTester
        .openStagingView();
    assertEquals("", stagingView.getCommitMessage());
View Full Code Here
93
94
95
96
97
98
99
100
101
102
103
        git.commit().setMessage("committing junk file").call();

        assertFalse(GitHelper.isMergedInto(git,"develop","master"));
       
        git.checkout().setName("master").call();
        git.merge().include(GitHelper.getLocalBranch(git, "develop")).call();

        assertTrue(GitHelper.isMergedInto(git, "develop", "master"));
       
    }
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.